Commit 474044cac4b1cc85e00703f728f04e6780692475

Authored by pengcheng
2 parents 2315c85a ed6c5d12

Merge remote-tracking branch 'origin/develop' into develop

src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
... ... @@ -435,6 +435,13 @@ public class InventoryDetail implements Serializable {
435 435 @ApiModelProperty(value="是否电池,1电池,2非电池")
436 436 private Integer materialIsBattery;
437 437  
  438 + /**
  439 + * 子条码
  440 + */
  441 + @TableField(value = "barcodeDetailsCode")
  442 + @ApiModelProperty(value="子条码")
  443 + private String barcodeDetailsCode;
  444 +
438 445  
439 446 private static final long serialVersionUID = 1L;
440 447 }
441 448 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
... ... @@ -414,6 +414,14 @@ public class ShipmentContainerDetail implements Serializable {
414 414 @ApiModelProperty(value="原料批次")
415 415 private String materialBatch;
416 416  
  417 + /**
  418 + * 子条码
  419 + * @return
  420 + */
  421 + @TableField(value = "barcodeDetailsCode")
  422 + @ApiModelProperty(value="子条码")
  423 + private String barcodeDetailsCode;
  424 +
417 425  
418 426 private static final long serialVersionUID = 1L;
419 427 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java
... ... @@ -11,11 +11,22 @@ public class ShipmentCombinationModel {
11 11 private int shipmentDetailId;
12 12 //组盘时选择的库存
13 13 private int inventoryDetailId;
  14 + //组盘时选择的库存子条码
  15 + private String barcodeDetailsCode;
14 16 //组盘数量
15 17 private BigDecimal shipQty;
16 18 //组盘类型
17 19 private Short type;
18 20  
  21 +
  22 + public String getBarcodeDetailsCode() {
  23 + return barcodeDetailsCode;
  24 + }
  25 +
  26 + public void setBarcodeDetailsCode(String barcodeDetailsCode) {
  27 + this.barcodeDetailsCode = barcodeDetailsCode;
  28 + }
  29 +
19 30 public BigDecimal getBatteryPackageWeight() {
20 31 return batteryPackageWeight;
21 32 }
... ...
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
... ... @@ -303,7 +303,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl<ShipmentCont
303 303 Boolean flag =true;
304 304 ShipmentContainerDetail shipmentContainerDetaill = new ShipmentContainerDetail();
305 305 //出库的重量信息需要从库存中获取
306   - InventoryDetail inventoryDetail = inventoryDetailService.getById(shipmentCombinationModel.getInventoryDetailId());
  306 + LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
  307 + queryWrapper.eq(InventoryDetail::getId,shipmentCombinationModel.getInventoryDetailId())
  308 + .eq(InventoryDetail::getBarcodeDetailsCode,shipmentCombinationModel.getBarcodeDetailsCode());
  309 + InventoryDetail inventoryDetail = inventoryDetailService.getOne(queryWrapper);
  310 +
307 311 if(shipmentDetail.getMaterialIsBattery()!=1){
308 312 //1.查看是否有同一出库明细的物料需要出库
309 313 LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
... ... @@ -312,6 +316,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
312 316 .eq(ShipmentContainerDetail::getContainerCode, shipmentContainerHeader.getContainerCode())
313 317 .eq(ShipmentContainerDetail::getShipmentDetailId, shipmentCombinationModel.getShipmentDetailId())
314 318 .eq(ShipmentContainerDetail::getInventoryId, shipmentCombinationModel.getInventoryDetailId())
  319 + .eq(ShipmentContainerDetail::getInventoryId, shipmentCombinationModel.getInventoryDetailId())
315 320 .eq(ShipmentContainerDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
316 321 ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getOne(lambdaQueryWrapper);
317 322 //修改容器状态
... ... @@ -418,6 +423,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
418 423 shipmentContainerDetaill.setMaterialBatch(inventoryDetail.getMaterialBatch());
419 424 shipmentContainerDetaill.setElectricQuantity(inventoryDetail.getElectricQuantity());
420 425 shipmentContainerDetaill.setBatteryPackTwoCode(inventoryDetail.getBatteryPackTwoCode());
  426 + shipmentContainerDetaill.setBarcodeDetailsCode(inventoryDetail.getBarcodeDetailsCode());
421 427 shipmentContainerDetaill.setQty(qty);
422 428 shipmentContainerDetaill.setWeights(new BigDecimal(0));
423 429 // shipmentContainerDetaill.setElectricQuantity(shipmentCombinationModel.getElectricQuantity());
... ...
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
... ... @@ -78,6 +78,10 @@ public class ShipmentHeader implements Serializable {
78 78 @TableField(value = "referCodeType")
79 79 @ApiModelProperty(value = "erp订单类型")
80 80 private String referCodeType;
  81 +
  82 + @TableField(value = "assistant")
  83 + @ApiModelProperty(value="销售出库单种类")
  84 + public String assistant;
81 85 /**
82 86 * 磅单编号
83 87 */
... ...
src/main/resources/mybatis/inventory/InventoryDetailMapper.xml
... ... @@ -55,6 +55,7 @@
55 55 <result column="completeness" jdbcType="VARCHAR" property="completeness" />
56 56 <result column="batteryPackTwoCode" jdbcType="VARCHAR" property="batteryPackTwoCode" />
57 57 <result column="materialIsBattery" jdbcType="INTEGER" property="materialIsBattery" />
  58 + <result column="barcodeDetailsCode" jdbcType="VARCHAR" property="barcodeDetailsCode" />
58 59  
59 60 </resultMap>
60 61 <sql id="Base_Column_List">
... ... @@ -64,7 +65,7 @@
64 65 supplierCode, referCode, referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate,
65 66 expirationDate, agingDate, attributeId, attribute1, attribute2, attribute3, lockCode,
66 67 lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, userDef1, userDef2,
67   - userDef3, processStamp, receiptCode, receiptDetailId,electricQuantity,materialNetWeight,materialTareWeight,materialGrossWeight
  68 + userDef3, processStamp, receiptCode, receiptDetailId,electricQuantity,materialNetWeight,materialTareWeight,materialGrossWeight,barcodeDetailsCode
68 69 </sql>
69 70  
70 71  
... ...
src/main/resources/mybatis/shipment/ShipmentContainerDetailMapper.xml
... ... @@ -83,6 +83,7 @@
83 83 <result column="materialGrossWeight" jdbcType="DECIMAL" property="materialGrossWeight" />
84 84 <result column="materialIsBattery" jdbcType="INTEGER" property="materialIsBattery" />
85 85 <result column="batteryPackTwoCode" jdbcType="VARCHAR" property="batteryPackTwoCode" />
  86 + <result column="barcodeDetailsCode" jdbcType="VARCHAR" property="barcodeDetailsCode" />
86 87 </resultMap>
87 88 <sql id="Base_Column_List">
88 89 <!--@mbg.generated-->
... ... @@ -97,7 +98,7 @@
97 98 attribute4, batch, lot, projectNo, manufactureDate, expirationDate, agingDate, inventorySts,
98 99 packingClass, created, createdBy, lastUpdated, lastUpdatedBy,
99 100 version, userDef1, userDef2, userDef3,
100   - processStamp,materialNetWeight,materialTareWeight,materialGrossWeight,batteryPackTwoCode
  101 + processStamp,materialNetWeight,materialTareWeight,materialGrossWeight,batteryPackTwoCode,barcodeDetailsCode
101 102 </sql>
102 103  
103 104 <select id="selectListMapByEqual" resultType="java.util.HashMap">
... ...
src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml
... ... @@ -55,6 +55,7 @@
55 55 <result column="deleted" jdbcType="BIT" property="deleted" />
56 56 <result column="pushErrorCount" jdbcType="INTEGER" property="pushErrorCount" />
57 57 <result column="pushSuccessStatus" jdbcType="INTEGER" property="pushSuccessStatus" />
  58 + <result column="assistant" jdbcType="VARCHAR" property="assistant" />
58 59 </resultMap>
59 60 <sql id="Base_Column_List">
60 61 <!--@mbg.generated-->
... ... @@ -65,7 +66,7 @@
65 66 totalWeight, totalQty, totalVolume, totalLines,
66 67 processType, lastWaveId, signValue, carrierCode, carrierService, shipmentNote, carrierServer,
67 68 carrierServerName, plateNumber, carModel, driverName, driverTel, created, createdBy,
68   - lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,processStamp, deleted
  69 + lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,processStamp, deleted,assistant
69 70 </sql>
70 71  
71 72 <select id="createCode" resultType="java.lang.String">
... ...
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
... ... @@ -237,7 +237,7 @@
237 237 events:'operateEvents',
238 238 formatter: function(value, row, index) {
239 239 let actions = [];
240   - actions.push('<a id="cancel" class="btn btn-success btn-xs" style="background-color: #ac2925" href="#" onclick="Combination(\'' + row.id + '\')"><i class="fa fa-edit"></i>配盘</a> ');
  240 + actions.push('<a id="cancel" class="btn btn-success btn-xs" style="background-color: #ac2925" href="#" onclick="Combination(\'' + row.id + '\',\'' + row.barcodeDetailsCode + '\')"><i class="fa fa-edit"></i>配盘</a> ');
241 241 return actions.join('');
242 242 }
243 243 },
... ... @@ -297,7 +297,11 @@
297 297 formatter: function(value, row, index) {
298 298 return $.table.selectDictLabel(inventoryStatus, value);
299 299 }
300   - },
  300 + },{
  301 + field : 'barcodeDetailsCode',
  302 + title : '子条码',
  303 + visible:false
  304 + }
301 305 ]
302 306 });
303 307  
... ... @@ -471,7 +475,7 @@
471 475 }
472 476  
473 477 //点击配盘显示的界面
474   - function Combination(id) {
  478 + function Combination(id,barcodeDetailsCode) {
475 479 let num=$("#receiveNum").val();
476 480 let weight = $("#receiveWeight").val();
477 481 let shipmentDetailId=$("#detailId").val();
... ... @@ -485,6 +489,7 @@
485 489 data:{
486 490 shipmentDetailId:shipmentDetailId,
487 491 inventoryDetailId:id,
  492 + barcodeDetailsCode:barcodeDetailsCode,
488 493 shipQty:num,
489 494 netWeight: weight,
490 495 electricQuantity:electricQuantity,
... ...