pfz_smile
/
depositroy
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

修改扫码功能

lwx_dev
erdanergou 3 years ago
parent
43814f1dea
commit
bf784692ee
4 changed files with 19 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
  2. 3
      src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
  3. 1
      src/main/resources/templates/pages/stockTaking/stockTaking.html
  4. 1
      target/classes/templates/pages/stockTaking/stockTaking.html

18
src/main/java/com/dreamchaser/depository_manage/controller/MaterialController.java
View File

@ -295,6 +295,7 @@ public class MaterialController {
List<InventoryP> inventory = materialService.findInventory(param);
Map<String, Object> paramByBarcode = new HashMap<>();
paramByBarcode.put("mcode", mcode);
paramByBarcode.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
if (inventory.size() > 0) {
InventoryP materialP = inventory.get(0);
@ -340,6 +341,7 @@ public class MaterialController {
param.put("code", inventory.getCode());
Map<String, Object> paramByBarcode = new HashMap<>();
paramByBarcode.put("mcode", inventory.getCode());
paramByBarcode.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
inventory.setMaterialAndBarCodeList(materialByBarCodeByCondition);
MaterialAndPlace placeAndMaterialByMidAndPid = placeService.findPlaceAndMaterialByMidAndPid(ObjectFormatUtil.toInteger(pid), inventory.getId());
@ -412,6 +414,7 @@ public class MaterialController {
}
paramByPrice.put("mcode", ip.getCode());
// 获取条形码与物料对应关系
paramByPrice.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByPrice);
ip.setMaterialAndBarCodeList(materialByBarCodeByCondition);
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(ip.getMid());
@ -427,6 +430,7 @@ public class MaterialController {
paramByPrice.put("mcode", mp.getCode());
paramByPrice.remove("code");
// 获取条形码与物料对应关系
paramByPrice.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByPrice);
mp.setMaterialAndBarCodeList(materialByBarCodeByCondition);
}
@ -466,6 +470,7 @@ public class MaterialController {
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(inventoryP.getMid());
inventoryP.setSplitInfoList(splitInfoByMid);
paramByBarcode.put("mcode", inventoryP.getCode());
paramByBarcode.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarcode);
inventoryP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
List<PlaceP> placeList = new ArrayList<>();
@ -739,6 +744,7 @@ public class MaterialController {
param.put("mcode", material.getString("code"));
MaterialP mp = new MaterialP(materialService.findMaterialById(material.getInteger("mid")));
// 获取物料与条形码的对应关系
param.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
for (int j = 0; j < depositoryByAdminorg.size(); j++) {
Depository depository = depositoryByAdminorg.get(j);
@ -829,7 +835,7 @@ public class MaterialController {
Map<String, Object> param = new HashMap<>();
List<PlaceP> placePList = new ArrayList<>();
param.put("mcode", mcode);
param.put("codeFlag",1);
InventoryP mp = null;
// 获取物料与条形码的对应关系
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
@ -876,7 +882,7 @@ public class MaterialController {
Map<String, Object> param = new HashMap<>();
List<PlaceP> placePList = new ArrayList<>();
param.put("mcode", mcode);
param.put("codeFlag",1);
InventoryP mp = null;
// 获取物料与条形码的对应关系
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
@ -928,6 +934,7 @@ public class MaterialController {
param.put("mcode", material.getString("code"));
InventoryP mp = new InventoryP(materialService.findInventoryById(material.getInteger("mid")));
// 获取物料与条形码的对应关系
param.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
param.put("mcode", material.getString("code"));
param.put("depositoryId", map.get("depositoryId"));
@ -985,9 +992,11 @@ public class MaterialController {
// 用于标识是否成功获取
boolean flag = true;
param.put("mcode", material.getCode());
param.put("codeFlag",1);
// MaterialP mp = new MaterialP(material);
InventoryP mp = new InventoryP();
// 获取物料与条形码的对应关系
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
param.put("mcode", material.getCode());
param.put("depositoryId", map.get("depositoryId"));
@ -1276,6 +1285,7 @@ public class MaterialController {
InventoryP materialP = inventory.get(0);
Map<String, Object> paramByBarCode = new HashMap<>();
paramByBarCode.put("mcode", materialP.getCode());
paramByBarCode.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramByBarCode);
materialP.setMaterialAndBarCodeList(materialByBarCodeByCondition);
isExist = true;
@ -1322,6 +1332,7 @@ public class MaterialController {
param.put("mcode", material.getString("code"));
InventoryP mp = new InventoryP(materialService.findInventoryById(material.getInteger("mid")));
// 获取物料与条形码的对应关系
param.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
param.put("mcode", material.getString("code"));
param.put("depositoryId", map.get("depositoryId"));
@ -1460,6 +1471,7 @@ public class MaterialController {
Integer mid = ObjectFormatUtil.toInteger(map.get("mid"));
Material materialById = materialService.findMaterialById(mid);
map.put("mcode", materialById.getCode());
map.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(map);
Integer codeCountByCondition = materialService.findMaterialByBarCodeCountByCondition(map);
return new RestResponse(materialByBarCodeByCondition, codeCountByCondition, 200);
@ -1519,6 +1531,7 @@ public class MaterialController {
// 如果成功获取
Map<String, Object> paramForCode = new HashMap<>();
paramForCode.put("mcode", materialP.getCode());
paramForCode.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(paramForCode);
List<SplitInfo> splitInfoByMid = splitUnitService.findSplitInfoByMid(materialP.getMid());
materialP.setSplitInfoList(splitInfoByMid);
@ -1555,6 +1568,7 @@ public class MaterialController {
return new RestResponse(null, 1, 200);
}
param.put("mcode", code);
param.put("codeFlag",1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
List<InventoryP> materialPByCondition = new ArrayList<>();
InventoryP mp = null;

3
src/main/java/com/dreamchaser/depository_manage/controller/PageController.java
View File

@ -605,7 +605,9 @@ public class PageController {
Material material = materialService.findMaterialById(id);
Map<String, Object> map = new HashMap<>();
map.put("mcode", material.getCode());
map.put("codeFlag", 1);
// 获取物料与条形码的对应关系
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(map);
mv.addObject("record", materialService.findMaterialAndTypeById(id));
mv.addObject("barCodeList", materialByBarCodeByCondition);
@ -2123,6 +2125,7 @@ public class PageController {
param.put("code", mp.getCode());
param.put("price", mp.getPrice());
param.put("version", mp.getVersion());
param.put("codeFlag", 1);
List<MaterialAndBarCode> materialByBarCodeByCondition = materialService.findMaterialByBarCodeByCondition(param);
param.put("materialAndBarCodeList", materialByBarCodeByCondition);
param.put("splitList", splitInfoByMid);

1
src/main/resources/templates/pages/stockTaking/stockTaking.html
View File

@ -1190,7 +1190,6 @@
scanMaterialCodeForTaking = function (obj) {
if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，

1
target/classes/templates/pages/stockTaking/stockTaking.html
View File

@ -1190,7 +1190,6 @@
scanMaterialCodeForTaking = function (obj) {
if (depositoryId !== undefined && departmentManagerId !== undefined && departmentManagerId !== "") {
parent.wx.scanQRCode({
desc: 'scanQRCode desc',
needResult: 1, // 默认为0，扫描结果由企业微信处理，1则直接返回扫描结果，

Write Preview
Loading…
Cancel
Save