wms / wms_xianyangming · Commits

Commit e2804b98314996a3797991e125120d600da924ec

Authored by pengyongcheng
1 parent 685d3919

fix: isMaterial改为boolean类型

Inline Side-by-side
Showing 22 changed files with 24 additions and 64 deletions
src/main/java/com/huaheng/api/mes/domain/MaterialData.java
  View file @e2804b9
... ... @@ -21,9 +21,9 @@ public class MaterialData {
21 21 private Integer locationNoY = -1;
22 22  
23 23 /**
24   - * 是否有物料，1：有物料 2：无物料
  24 + * 是否有物料，true：有物料 false：无物料
25 25 */
26   - private Integer isMaterial;
  26 + private Boolean isMaterial;
27 27  
28 28 /**
29 29 * 物料编码
... ...
src/main/java/com/huaheng/api/mes/domain/ReceiptMaterialData.java
  View file @e2804b9
... ... @@ -21,9 +21,9 @@ public class ReceiptMaterialData {
21 21 private Integer locationNoY = -1;
22 22  
23 23 /**
24   - * 是否有物料，1：有， 0：没有
  24 + * 是否有物料，true：有， false：没有
25 25 */
26   - private Integer isMaterial;
  26 + private Boolean isMaterial;
27 27  
28 28 /**
29 29 * 物料编码
... ...
src/main/java/com/huaheng/api/mes/service/MesServiceImpl.java
  View file @e2804b9
... ... @@ -356,7 +356,7 @@ public class MesServiceImpl implements MesService {
356 356 List<InventoryDetail> inventoryDetails = inventoryDetailList.stream().
357 357 filter(detail -> detail.getMaterialCode().equals(material.getCode()))
358 358 .collect(Collectors.toList());
359   - inventoryDetails.forEach(inv -> inv.setShipmentReferCode(shipmentHeader.getReferCode()));
  359 + //inventoryDetails.forEach(inv -> inv.setShipmentReferCode(shipmentHeader.getReferCode()));
360 360 if (!inventoryDetailService.updateBatchById(inventoryDetails)) {
361 361 throw new ServiceException("领料单下发失败，冻结库存明细失败");
362 362 }
... ... @@ -764,7 +764,7 @@ public class MesServiceImpl implements MesService {
764 764 List<MesOrderMaterial> mesOrderMaterialList = new ArrayList<>();
765 765 for (ReceiptMaterialData data : mesReceipt.getReceiptMaterialDataList()) {
766 766 // 没有物料不算库存
767   - if (QuantityConstant.ISMATERIAL_FALSE.equals(data.getIsMaterial())) {
  767 + if (!data.getIsMaterial()) {
768 768 continue;
769 769 }
770 770 MesOrderMaterial mesOrderMaterial = new MesOrderMaterial();
... ... @@ -916,7 +916,7 @@ public class MesServiceImpl implements MesService {
916 916 List<ReceiptContainerDetail> detailList = new ArrayList<>();
917 917 for (ReceiptMaterialData data : materialDataList) {
918 918 // 没有物料不算库存
919   - if (QuantityConstant.ISMATERIAL_FALSE.equals(data.getIsMaterial())) {
  919 + if (!data.getIsMaterial()) {
920 920 continue;
921 921 }
922 922 Material material = materialService.getMaterialByCode(data.getMaterialCode(), QuantityConstant.DEFAULT_WAREHOUSE);
... ... @@ -1134,7 +1134,7 @@ public class MesServiceImpl implements MesService {
1134 1134 List<MaterialData> materialDataList = new ArrayList<>();
1135 1135 taskDetailList.forEach(taskDetail -> {
1136 1136 MaterialData materialData = new MaterialData();
1137   - materialData.setIsMaterial(QuantityConstant.ISMATEIRAL_TRUE);
  1137 + materialData.setIsMaterial(true);
1138 1138 materialData.setMaterialCode(taskDetail.getMaterialCode());
1139 1139 materialData.setQty(taskDetail.getQty());
1140 1140 materialData.setTracingNo(taskDetail.getTracingNo());
... ... @@ -1173,7 +1173,7 @@ public class MesServiceImpl implements MesService {
1173 1173 MaterialData newMaterialData = new MaterialData();
1174 1174 newMaterialData.setLocationNoX(Integer.parseInt(split[0]));
1175 1175 newMaterialData.setLocationNoY(Integer.parseInt(split[1]));
1176   - newMaterialData.setIsMaterial(QuantityConstant.ISMATERIAL_FALSE);
  1176 + newMaterialData.setIsMaterial(false);
1177 1177 materialDataList.add(newMaterialData);
1178 1178 });
1179 1179 }
... ... @@ -1346,7 +1346,7 @@ public class MesServiceImpl implements MesService {
1346 1346 MaterialData materialData = new MaterialData();
1347 1347 materialData.setLocationNoX(x);
1348 1348 materialData.setLocationNoY(y);
1349   - materialData.setIsMaterial(QuantityConstant.ISMATERIAL_FALSE);
  1349 + materialData.setIsMaterial(false);
1350 1350 materialDataList.add(materialData);
1351 1351 }
1352 1352 }
... ... @@ -1403,7 +1403,7 @@ public class MesServiceImpl implements MesService {
1403 1403 taskDetailList.forEach(taskDetail -> {
1404 1404 MaterialData materialData = new MaterialData();
1405 1405 BeanUtils.copyBeanProp(materialData, taskDetail);
1406   - materialData.setIsMaterial(QuantityConstant.ISMATEIRAL_TRUE);
  1406 + materialData.setIsMaterial(true);
1407 1407 materialDataList.add(materialData);
1408 1408 });
1409 1409  
... ... @@ -1417,7 +1417,7 @@ public class MesServiceImpl implements MesService {
1417 1417 MaterialData newMaterialData = new MaterialData();
1418 1418 newMaterialData.setLocationNoX(Integer.parseInt(split[0]));
1419 1419 newMaterialData.setLocationNoY(Integer.parseInt(split[1]));
1420   - newMaterialData.setIsMaterial(QuantityConstant.ISMATERIAL_FALSE);
  1420 + newMaterialData.setIsMaterial(false);
1421 1421 materialDataList.add(newMaterialData);
1422 1422 });
1423 1423  
... ... @@ -1819,7 +1819,7 @@ public class MesServiceImpl implements MesService {
1819 1819 }
1820 1820 List<MesOrderMaterial> mesOrderMaterialList = new ArrayList<>();
1821 1821 for (MaterialData data : mesReceiptByQCDto.getMaterialDataList()) {
1822   - if (QuantityConstant.ISMATERIAL_FALSE.equals(data.getIsMaterial())) {
  1822 + if (!data.getIsMaterial()) {
1823 1823 continue;
1824 1824 }
1825 1825 MesOrderMaterial mesOrderMaterial = new MesOrderMaterial();
... ...
src/main/java/com/huaheng/common/constant/QuantityConstant.java
  View file @e2804b9
... ... @@ -1041,10 +1041,10 @@ public class QuantityConstant {
1041 1041 /**
1042 1042 * 有物料
1043 1043 */
1044   - public static final Integer ISMATEIRAL_TRUE = 1;
  1044 + //public static final Integer ISMATEIRAL_TRUE = 1;
1045 1045  
1046 1046 /**
1047 1047 * 无物料
1048 1048 */
1049   - public static final Integer ISMATERIAL_FALSE = 0;
  1049 + //public static final Integer ISMATERIAL_FALSE = 0;
1050 1050 }
1051 1051 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/inventory/cycleCountDetail/domain/CycleCountDetailChild.java
  View file @e2804b9
... ... @@ -200,13 +200,6 @@ public class CycleCountDetailChild implements Serializable {
200 200 private String batch;
201 201  
202 202 /**
203   - * 是否原材料
204   - */
205   - @TableField(value = "isMaterial")
206   - @ApiModelProperty(value = "是否原材料")
207   - private Boolean isMaterial;
208   -
209   - /**
210 203 * 药量(克)
211 204 */
212 205 @TableField(value = "weight")
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/controller/InventoryDetailController.java
  View file @e2804b9
... ... @@ -101,7 +101,6 @@ public class InventoryDetailController extends BaseController {
101 101 .like(StringUtils.isNotEmpty(inventoryDetail.getOrderCode()), InventoryDetail::getOrderCode, inventoryDetail.getOrderCode())
102 102 .like(StringUtils.isNotEmpty(inventoryDetail.getOrderNumber()), InventoryDetail::getOrderNumber, inventoryDetail.getOrderNumber())
103 103 .like(StringUtils.isNotEmpty(inventoryDetail.getBatchNumber()), InventoryDetail::getBatchNumber, inventoryDetail.getBatchNumber())
104   - .like(StringUtils.isNotEmpty(inventoryDetail.getShipmentReferCode()), InventoryDetail::getShipmentReferCode, inventoryDetail.getShipmentReferCode())
105 104 .like(StringUtils.isNotEmpty(inventoryDetail.getCreatedBy()), InventoryDetail::getCreatedBy, inventoryDetail.getCreatedBy())
106 105 //货主
107 106 .in(StringUtils.isNotEmpty(inventoryDetail.getCompanyCode()), InventoryDetail::getCompanyCode, inventoryDetail.getCompanyCode())
... ... @@ -342,7 +341,6 @@ public class InventoryDetailController extends BaseController {
342 341 .eq(StringUtils.isNotNull(inventoryDetail.getSolidifyTime()), InventoryDetail::getSolidifyTime, inventoryDetail.getSolidifyTime())
343 342 .like(StringUtils.isNotEmpty(inventoryDetail.getBatch()), InventoryDetail::getBatch, inventoryDetail.getBatch())
344 343 .like(StringUtils.isNotEmpty(inventoryDetail.getOrderCode()), InventoryDetail::getOrderCode, inventoryDetail.getOrderCode())
345   - .like(StringUtils.isNotEmpty(inventoryDetail.getShipmentReferCode()), InventoryDetail::getShipmentReferCode, inventoryDetail.getShipmentReferCode())
346 344 .like(StringUtils.isNotEmpty(inventoryDetail.getCreatedBy()), InventoryDetail::getCreatedBy, inventoryDetail.getCreatedBy())
347 345 .orderByDesc(InventoryDetail::getId);
348 346 List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(lambdaQueryWrapper);
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
  View file @e2804b9
... ... @@ -370,20 +370,6 @@ public class InventoryDetail implements Serializable {
370 370 private String batchNumber;
371 371  
372 372 /**
373   - * 冻结领料单号
374   - */
375   - @TableField(value = "shipmentReferCode")
376   - @ApiModelProperty(value = "冻结出库单号")
377   - private String shipmentReferCode;
378   -
379   - /**
380   - * 是否原材料，true：原材料，false：半成品
381   - */
382   - @TableField(value = "isMaterial")
383   - @ApiModelProperty(value = "是否原材料")
384   - private Boolean isMaterial;
385   -
386   - /**
387 373 * x轴坐标
388 374 */
389 375 @TableField(value = "locationNoX")
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailService.java
  View file @e2804b9
... ... @@ -90,13 +90,12 @@ public interface InventoryDetailService extends IService&lt;InventoryDetail&gt; {
90 90 List<InventoryDetail> getByZoneCode(String zoneCode);
91 91  
92 92 /**
93   - * 根据 工单号orderCode 和 是否原材料isMaterial 查询库存
  93 + * 根据工单号orderCode查询库存
94 94 *
95 95 * @param orderCode 工单号
96   - * @param isMaterial 是否原材料，true: 是，false: 否
97 96 * @return 库存
98 97 */
99   - List<InventoryDetail> getByOrderCodeAndMaterialType(String orderCode, boolean isMaterial);
  98 + List<InventoryDetail> getByOrderCodeAndMaterialType(String orderCode);
100 99  
101 100 /**
102 101 * 根据库存头id集合查询库存明细
... ...
src/main/java/com/huaheng/pc/inventory/inventoryDetail/service/InventoryDetailServiceImpl.java
  View file @e2804b9
... ... @@ -401,11 +401,10 @@ public class InventoryDetailServiceImpl extends ServiceImpl&lt;InventoryDetailMappe
401 401 }
402 402  
403 403 @Override
404   - public List<InventoryDetail> getByOrderCodeAndMaterialType(String orderCode, boolean isMaterial) {
  404 + public List<InventoryDetail> getByOrderCodeAndMaterialType(String orderCode) {
405 405 LambdaQueryWrapper<InventoryDetail> inventoryDetailQueryWrapper = Wrappers.lambdaQuery();
406 406 inventoryDetailQueryWrapper
407   - .eq(InventoryDetail::getOrderCode, orderCode)
408   - .eq(InventoryDetail::getIsMaterial, isMaterial);
  407 + .eq(InventoryDetail::getOrderCode, orderCode);
409 408 return list(inventoryDetailQueryWrapper);
410 409 }
411 410  
... ...
src/main/java/com/huaheng/pc/inventory/inventoryTransaction/domain/InventoryTransaction.java
  View file @e2804b9
... ... @@ -103,9 +103,9 @@ public class InventoryTransaction implements Serializable {
103 103 /**
104 104 * 是否原材料，true：原材料，false：半成品
105 105 */
106   - @TableField(value = "isMaterial")
  106 + /*@TableField(value = "isMaterial")
107 107 @ApiModelProperty(value = "是否原材料")
108   - private Boolean isMaterial;
  108 + private Boolean isMaterial;*/
109 109  
110 110 /**
111 111 * 数量
... ...
src/main/java/com/huaheng/pc/receipt/receiptContainerHeader/service/ReceiptContainerHeaderServiceImpl.java
  View file @e2804b9
... ... @@ -575,7 +575,6 @@ public class ReceiptContainerHeaderServiceImpl extends ServiceImpl&lt;ReceiptContai
575 575 receiptContainerDetail.setLocationNoX(locationNoX);
576 576 receiptContainerDetail.setLocationNoY(locationNoY);
577 577 receiptContainerDetail.setTracingNo(tracingNo);
578   - //receiptContainerDetail.setIsMaterial(QuantityConstant.IS_MATERIAL);
579 578 if (!receiptContainerDetailService.save(receiptContainerDetail)) {
580 579 throw new ServiceException("保存入库组盘详情失败");
581 580 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @e2804b9
... ... @@ -232,7 +232,6 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
232 232 receiptDetail.setSupplierTracingNo(materialData.getSupplierTracingNo());
233 233 receiptDetail.setLocationNoX(materialData.getLocationNoX());
234 234 receiptDetail.setLocationNoY(materialData.getLocationNoY());
235   - //receiptDetail.setIsMaterial(materialData.getIsMaterial());
236 235 receiptDetail.setCreatedBy(QuantityConstant.PLATFORM_MES);
237 236 receiptDetail.setLastUpdatedBy(QuantityConstant.PLATFORM_MES);
238 237 receiptDetailList.add(receiptDetail);
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
  View file @e2804b9
... ... @@ -116,9 +116,9 @@ public class ShipmentContainerDetail implements Serializable {
116 116 /**
117 117 * 是否原材料
118 118 */
119   - @TableField(value = "isMaterial")
  119 + /*@TableField(value = "isMaterial")
120 120 @ApiModelProperty(value = "是否原材料")
121   - private Boolean isMaterial;
  121 + private Boolean isMaterial;*/
122 122  
123 123 /**
124 124 * 药量(克)
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/CycleCountTaskServiceImpl.java
  View file @e2804b9
... ... @@ -132,7 +132,6 @@ public class CycleCountTaskServiceImpl implements CycleCountTaskService {
132 132 taskDetail.setTracingNo(cycleCountDetailChild.getTracingNo());
133 133 taskDetail.setLocationNoX(cycleCountDetailChild.getLocationNoX());
134 134 taskDetail.setLocationNoY(cycleCountDetailChild.getLocationNoY());
135   - //taskDetail.setIsMaterial(QuantityConstant.INVENTORY_STATUS_OK.equals(cycleCountDetailChild.getInventorySts()));
136 135 taskDetail.setQty(cycleCountDetailChild.getSystemQty());
137 136 taskDetail.setCompanyCode(cycleCountDetail.getCompanyCode());
138 137 if (!taskDetailService.save(taskDetail)) {
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/ReceiptTaskServiceImpl.java
  View file @e2804b9
... ... @@ -218,7 +218,6 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService {
218 218 taskDetail.setMaterialInspectStatus(item.getMaterialInspectStatus());
219 219 taskDetail.setLocationNoX(item.getLocationNoX());
220 220 taskDetail.setLocationNoY(item.getLocationNoY());
221   - //taskDetail.setIsMaterial(item.getIsMaterial());
222 221 taskDetail.setWeight(item.getWeight());
223 222 taskDetail.setTracingNo(item.getTracingNo());
224 223 taskDetail.setBatch(item.getBatch());
... ... @@ -569,7 +568,6 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService {
569 568 inventoryDetail.setInventorySts(taskDetail.getInventorySts());
570 569 inventoryDetail.setMaterialInspectStatus(taskDetail.getMaterialInspectStatus());
571 570 inventoryDetail.setQty(receiptQty);
572   - //inventoryDetail.setIsMaterial(taskDetail.getIsMaterial());
573 571 inventoryDetail.setTaskQty(BigDecimal.ZERO);
574 572 inventoryDetail.setReferCode(receiptDetail.getReferCode());
575 573 inventoryDetail.setReferDetailId(receiptDetail.getReferLineNum());
... ... @@ -738,7 +736,6 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService {
738 736 taskHeader.setOrderCode(receiptContainerHeader.getOrderCode());
739 737 taskHeader.setOrderNumber(receiptContainerHeader.getOrderNumber());
740 738 taskHeader.setBatchNumber(receiptContainerHeader.getBatchNumber());
741   - //taskHeader.setShipmentReferCode(receiptContainerHeader.getShipmentReferCode());
742 739 taskHeader.setFromPort(fromPort);
743 740 if (receiptContainerHeader.getToLocation() != null) {
744 741 taskHeader.setToLocation(receiptContainerHeader.getToLocation());
... ... @@ -773,7 +770,6 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService {
773 770 taskDetail.setInventorySts(receiptContainerDetail.getInventorySts());
774 771 taskDetail.setLocationNoX(receiptContainerDetail.getLocationNoX());
775 772 taskDetail.setLocationNoY(receiptContainerDetail.getLocationNoY());
776   - //taskDetail.setIsMaterial(receiptContainerDetail.getIsMaterial());
777 773 taskDetail.setWeight(receiptContainerDetail.getWeight());
778 774 taskDetail.setTracingNo(receiptContainerDetail.getTracingNo());
779 775 taskDetail.setBatch(receiptContainerDetail.getBatch());
... ... @@ -823,7 +819,6 @@ public class ReceiptTaskServiceImpl implements ReceiptTaskService {
823 819 .orElse(null);
824 820 LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
825 821 queryWrapper.eq(InventoryDetail::getMaterialCode, materialCode)
826   - .eq(InventoryDetail::getShipmentReferCode, receiptContainerHeader.getShipmentReferCode())
827 822 .eq(InventoryDetail::getOrderCode, receiptContainerHeader.getOrderCode())
828 823 .apply("qty != taskQty");
829 824 List<InventoryDetail> inventoryDetailList = inventoryDetailService.list(queryWrapper);
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/ShipmentTaskService.java
  View file @e2804b9
... ... @@ -238,7 +238,6 @@ public class ShipmentTaskService {
238 238 taskDetail.setLocationNoY(shipmentContainerDetail.getLocationNoY());
239 239 taskDetail.setOrderCode(shipmentContainerDetail.getOrderCode());
240 240 taskDetail.setTracingNo(shipmentContainerDetail.getTracingNo());
241   - //taskDetail.setIsMaterial(shipmentContainerDetail.getIsMaterial());
242 241 taskDetail.setFlowCode(shipmentContainerDetail.getFlowCode());
243 242 taskDetail.setFirstFlag(shipmentContainerDetail.getFirstFlag());
244 243 taskDetail.setCreatedBy(shipmentContainerDetail.getCreatedBy());
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskHeaderServiceImpl.java
  View file @e2804b9
... ... @@ -821,7 +821,6 @@ public class TaskHeaderServiceImpl extends ServiceImpl&lt;TaskHeaderMapper, TaskHea
821 821 QuantityConstant.INVENTORY_STATUS_OK : QuantityConstant.INVENTORY_STATUS_NG);
822 822 taskDetail.setSupplierCode(materialData.getSupplierCode());
823 823 taskDetail.setSupplierTracingNo(materialData.getSupplierTracingNo());
824   - //taskDetail.setIsMaterial(false);
825 824 taskDetail.setOrderCode(taskHeader.getOrderCode());
826 825 Material material = materialService.getByCode(materialData.getMaterialCode());
827 826 taskDetail.setMaterialCode(material.getCode());
... ...
src/main/java/com/huaheng/pc/task/taskHeader/service/WorkTaskServiceImpl.java
  View file @e2804b9
... ... @@ -1247,7 +1247,6 @@ public class WorkTaskServiceImpl implements WorkTaskService {
1247 1247 taskDetail.setQty(materialData.getQty());
1248 1248 taskDetail.setTracingNo(materialData.getTracingNo());
1249 1249 taskDetail.setOrderCode(orderCode);
1250   - //taskDetail.setIsMaterial(materialData.getIsMaterial());
1251 1250 taskDetailList.add(taskDetail);
1252 1251 });
1253 1252 if (!taskDetailService.saveBatch(taskDetailList)) {
... ...
src/main/resources/mybatis/receipt/ReceiptContainerDetailMapper.xml
  View file @e2804b9
... ... @@ -53,7 +53,6 @@
53 53 <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
54 54 <result column="locationNoX" jdbcType="INTEGER" property="locationNoX" />
55 55 <result column="locationNoY" jdbcType="INTEGER" property="locationNoY" />
56   - <result column="isMaterial" jdbcType="BIT" property="isMaterial" />
57 56 <result column="tracingNo" jdbcType="VARCHAR" property="tracingNo" />
58 57 <result column="qualityStatus" jdbcType="BIT" property="qualityStatus" />
59 58 </resultMap>
... ... @@ -65,6 +64,6 @@
65 64 supplierCode, batch, lot, projectNo, weight, manufactureDate, expirationDate, agingDate,
66 65 inventorySts, taskCreated, convertedQty, convertedQtyUnit, created, createdBy, lastUpdated,
67 66 lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6,
68   - userDef7, userDef8, processStamp, locationNoX, locationNoY, isMaterial, tracingNo, qualityStatus
  67 + userDef7, userDef8, processStamp, locationNoX, locationNoY, tracingNo, qualityStatus
69 68 </sql>
70 69 </mapper>
71 70 \ No newline at end of file
... ...
src/main/resources/templates/receipt/receiptHeader/rawReceipt.html
  View file @e2804b9
... ... @@ -452,7 +452,6 @@
452 452 "qty": data.qty,
453 453 "tracingNo": data.tracingNo,
454 454 "qualityStatus": true,
455   - "isMaterial": true,
456 455 "supplierCode": data.supplierCode,
457 456 "supplierTracingNo": data.supplierTracingNo
458 457 })
... ...
src/main/resources/templates/receipt/receiptHeader/semiReceipt.html
  View file @e2804b9
... ... @@ -452,7 +452,6 @@
452 452 "qty": data.qty,
453 453 "tracingNo": data.tracingNo,
454 454 "qualityStatus": true,
455   - "isMaterial": true,
456 455 "supplierCode": data.supplierCode,
457 456 "supplierTracingNo": data.supplierTracingNo
458 457 })
... ...
src/main/resources/templates/task/cbgAssemble/assemble.html
  View file @e2804b9
... ... @@ -256,7 +256,6 @@
256 256 "qty": data.qty,
257 257 "tracingNo": data.tracingNo,
258 258 "qualityStatus": true,
259   - "isMaterial": true
260 259 })
261 260 });
262 261 let json = {
... ...