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

pengcheng
2 parents 2315c85a ed6c5d12
Showing 9 changed files with 51 additions and 7 deletions
src/main/java/com/huaheng/pc/inventory/inventoryDetail/domain/InventoryDetail.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerDetail/domain/ShipmentContainerDetail.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentCombinationModel.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/domain/ShipmentHeader.java
src/main/resources/mybatis/inventory/InventoryDetailMapper.xml
src/main/resources/mybatis/shipment/ShipmentContainerDetailMapper.xml
src/main/resources/mybatis/shipment/ShipmentHeaderMapper.xml
src/main/resources/templates/shipment/shippingCombination/shippingCombination.html
@@ -435,6 +435,13 @@ public class InventoryDetail implements Serializable {
     @ApiModelProperty(value="是否电池，1电池，2非电池")
     private Integer materialIsBattery;
  
+    /**
+     * 子条码
+     */
+    @TableField(value = "barcodeDetailsCode")
+    @ApiModelProperty(value="子条码")
+    private String barcodeDetailsCode;
+
  
     private static final long serialVersionUID = 1L;
 }
 \ No newline at end of file
@@ -414,6 +414,14 @@ public class ShipmentContainerDetail implements Serializable {
     @ApiModelProperty(value="原料批次")
     private String materialBatch;
  
+    /**
+     * 子条码
+     * @return
+     */
+    @TableField(value = "barcodeDetailsCode")
+    @ApiModelProperty(value="子条码")
+    private String barcodeDetailsCode;
+
  
     private static final long serialVersionUID = 1L;
 }
@@ -11,11 +11,22 @@ public class ShipmentCombinationModel {
     private int shipmentDetailId;
     //组盘时选择的库存
     private int inventoryDetailId;
+    //组盘时选择的库存子条码
+    private String barcodeDetailsCode;
     //组盘数量
     private BigDecimal shipQty;
     //组盘类型
     private Short type;
  
+
+    public String getBarcodeDetailsCode() {
+        return barcodeDetailsCode;
+    }
+
+    public void setBarcodeDetailsCode(String barcodeDetailsCode) {
+        this.barcodeDetailsCode = barcodeDetailsCode;
+    }
+
     public BigDecimal getBatteryPackageWeight() {
         return batteryPackageWeight;
     }
@@ -303,7 +303,11 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         Boolean flag =true;
         ShipmentContainerDetail shipmentContainerDetaill = new ShipmentContainerDetail();
         //出库的重量信息需要从库存中获取
-        InventoryDetail inventoryDetail = inventoryDetailService.getById(shipmentCombinationModel.getInventoryDetailId());
+        LambdaQueryWrapper<InventoryDetail> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(InventoryDetail::getId,shipmentCombinationModel.getInventoryDetailId())
+                .eq(InventoryDetail::getBarcodeDetailsCode,shipmentCombinationModel.getBarcodeDetailsCode());
+        InventoryDetail inventoryDetail = inventoryDetailService.getOne(queryWrapper);
+
         if(shipmentDetail.getMaterialIsBattery()!=1){
             //1.查看是否有同一出库明细的物料需要出库
             LambdaQueryWrapper<ShipmentContainerDetail> lambdaQueryWrapper=Wrappers.lambdaQuery();
@@ -312,6 +316,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
                     .eq(ShipmentContainerDetail::getContainerCode, shipmentContainerHeader.getContainerCode())
                     .eq(ShipmentContainerDetail::getShipmentDetailId, shipmentCombinationModel.getShipmentDetailId())
                     .eq(ShipmentContainerDetail::getInventoryId, shipmentCombinationModel.getInventoryDetailId())
+                    .eq(ShipmentContainerDetail::getInventoryId, shipmentCombinationModel.getInventoryDetailId())
                     .eq(ShipmentContainerDetail::getWarehouseCode, ShiroUtils.getWarehouseCode());
             ShipmentContainerDetail shipmentContainerDetail = shipmentContainerDetailService.getOne(lambdaQueryWrapper);
             //修改容器状态
@@ -418,6 +423,7 @@ public class ShipmentContainerHeaderServiceImpl extends ServiceImpl&lt;ShipmentCont
         shipmentContainerDetaill.setMaterialBatch(inventoryDetail.getMaterialBatch());
         shipmentContainerDetaill.setElectricQuantity(inventoryDetail.getElectricQuantity());
         shipmentContainerDetaill.setBatteryPackTwoCode(inventoryDetail.getBatteryPackTwoCode());
+        shipmentContainerDetaill.setBarcodeDetailsCode(inventoryDetail.getBarcodeDetailsCode());
         shipmentContainerDetaill.setQty(qty);
         shipmentContainerDetaill.setWeights(new BigDecimal(0));
 //        shipmentContainerDetaill.setElectricQuantity(shipmentCombinationModel.getElectricQuantity());
@@ -78,6 +78,10 @@ public class ShipmentHeader implements Serializable {
     @TableField(value = "referCodeType")
     @ApiModelProperty(value = "erp订单类型")
     private String referCodeType;
+
+    @TableField(value = "assistant")
+    @ApiModelProperty(value="销售出库单种类")
+    public String assistant;
     /**
      * 磅单编号
      */
@@ -55,6 +55,7 @@
       <result column="completeness" jdbcType="VARCHAR" property="completeness" />
       <result column="batteryPackTwoCode" jdbcType="VARCHAR" property="batteryPackTwoCode" />
       <result column="materialIsBattery" jdbcType="INTEGER" property="materialIsBattery" />
+      <result column="barcodeDetailsCode" jdbcType="VARCHAR" property="barcodeDetailsCode" />
  
   </resultMap>
   <sql id="Base_Column_List">
@@ -64,7 +65,7 @@
     supplierCode, referCode, referDetailId, batch, lot, projectNo, qcCheck, weight, manufactureDate, 
     expirationDate, agingDate, attributeId, attribute1, attribute2, attribute3, lockCode, 
     lastCycleCountDate, created, createdBy, lastUpdated, lastUpdatedBy, userDef1, userDef2, 
-    userDef3, processStamp, receiptCode, receiptDetailId,electricQuantity,materialNetWeight,materialTareWeight,materialGrossWeight
+    userDef3, processStamp, receiptCode, receiptDetailId,electricQuantity,materialNetWeight,materialTareWeight,materialGrossWeight,barcodeDetailsCode
   </sql>
  
  
@@ -83,6 +83,7 @@
     <result column="materialGrossWeight" jdbcType="DECIMAL" property="materialGrossWeight" />
     <result column="materialIsBattery" jdbcType="INTEGER" property="materialIsBattery" />
     <result column="batteryPackTwoCode" jdbcType="VARCHAR" property="batteryPackTwoCode" />
+    <result column="barcodeDetailsCode" jdbcType="VARCHAR" property="barcodeDetailsCode" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -97,7 +98,7 @@
     attribute4, batch, lot, projectNo, manufactureDate, expirationDate, agingDate, inventorySts, 
     packingClass, created, createdBy, lastUpdated, lastUpdatedBy,
     version, userDef1, userDef2, userDef3,
-    processStamp,materialNetWeight,materialTareWeight,materialGrossWeight,batteryPackTwoCode
+    processStamp,materialNetWeight,materialTareWeight,materialGrossWeight,batteryPackTwoCode,barcodeDetailsCode
   </sql>
  
   <select id="selectListMapByEqual" resultType="java.util.HashMap">
@@ -55,6 +55,7 @@
     <result column="deleted" jdbcType="BIT" property="deleted" />
     <result column="pushErrorCount" jdbcType="INTEGER" property="pushErrorCount" />
     <result column="pushSuccessStatus" jdbcType="INTEGER" property="pushSuccessStatus" />
+    <result column="assistant" jdbcType="VARCHAR" property="assistant" />
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
@@ -65,7 +66,7 @@
     totalWeight, totalQty, totalVolume, totalLines,
     processType, lastWaveId, signValue, carrierCode, carrierService, shipmentNote, carrierServer, 
     carrierServerName, plateNumber, carModel, driverName, driverTel, created, createdBy, 
-    lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,processStamp, deleted
+    lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,processStamp, deleted,assistant
   </sql>
  
   <select id="createCode" resultType="java.lang.String">
@@ -237,7 +237,7 @@
                 events:'operateEvents',
                 formatter: function(value, row, index) {
                     let actions = [];
-                    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> ');
+                    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> ');
                     return actions.join('');
                 }
             },
@@ -297,7 +297,11 @@
                 formatter: function(value, row, index) {
                     return $.table.selectDictLabel(inventoryStatus, value);
                 }
-            },
+            },{
+                field : 'barcodeDetailsCode',
+                title : '子条码',
+                visible:false
+            }
         ]
     });
  
@@ -471,7 +475,7 @@
     }
  
     //点击配盘显示的界面
-    function Combination(id) {
+    function Combination(id,barcodeDetailsCode) {
         let num=$("#receiveNum").val();
         let weight = $("#receiveWeight").val();
         let shipmentDetailId=$("#detailId").val();
@@ -485,6 +489,7 @@
             data:{
                 shipmentDetailId:shipmentDetailId,
                 inventoryDetailId:id,
+                barcodeDetailsCode:barcodeDetailsCode,
                 shipQty:num,
                 netWeight: weight,
                 electricQuantity:electricQuantity,