组盘多余字段删除和界面修改

pengcheng
1 parent 45137afd
Showing 4 changed files with 19 additions and 295 deletions
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/domain/ShipmentContainerHeader.java
src/main/java/com/huaheng/pc/shipment/shipmentContainerHeader/service/ShipmentContainerHeaderServiceImpl.java
src/main/resources/templates/shipment/shipmentContainerHeader/shipmentContainerHeader.html
@@ -66,6 +66,10 @@ public class ShipmentContainerHeaderController extends BaseController
 		lambdaQueryWrapper.eq(ShipmentContainerHeader::getWarehouseCode,ShiroUtils.getWarehouseCode())
 				.ge(StringUtils.isNotEmpty(createdBegin),ShipmentContainerHeader::getCreated, createdBegin)
 				.le(StringUtils.isNotEmpty(createdEnd), ShipmentContainerHeader::getCreated, createdEnd)
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getShipmentCode()), ShipmentContainerHeader::getShipmentCode, shipmentContainerHeader.getShipmentCode())
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getContainerCode()), ShipmentContainerHeader::getContainerCode, shipmentContainerHeader.getContainerCode())
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getLocationCode()), ShipmentContainerHeader::getLocationCode, shipmentContainerHeader.getLocationCode())
+				.eq(StringUtils.isNotEmpty(shipmentContainerHeader.getCreatedBy()), ShipmentContainerHeader::getCreatedBy, shipmentContainerHeader.getCreatedBy())
 				.le(shipmentContainerHeader.getStatus()==null,ShipmentContainerHeader::getStatus,20)
 				.eq(shipmentContainerHeader.getStatus()!=null,ShipmentContainerHeader::getStatus,shipmentContainerHeader.getStatus());
 		if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
@@ -98,12 +98,6 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="高")
     private BigDecimal height;
  
-    /**
-     * 价值
-     */
-    @TableField(value = "totalValue")
-    @ApiModelProperty(value="价值")
-    private BigDecimal totalValue;
  
     /**
      * 出库单内部号
@@ -154,19 +148,6 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="波次号")
     private Integer waveId;
  
-    /**
-     * 货箱计数号
-     */
-    @TableField(value = "countIndex")
-    @ApiModelProperty(value="货箱计数号")
-    private Integer countIndex;
-
-    /**
-     * 货箱计数总数
-     */
-    @TableField(value = "countTotal")
-    @ApiModelProperty(value="货箱计数总数")
-    private Integer countTotal;
  
     /**
      * 任务已创建？
@@ -185,9 +166,9 @@ public class ShipmentContainerHeader implements Serializable {
     /**
      * 周转箱号
      */
-    @TableField(value = "transContCode")
+    @TableField(value = "transContainerCode")
     @ApiModelProperty(value="周转箱号")
-    private String transContCode;
+    private String transContainerCode;
  
     /**
      * 复核工作台
@@ -218,41 +199,6 @@ public class ShipmentContainerHeader implements Serializable {
     private Date oqcEndAt;
  
     /**
-     * 装载号
-     */
-    @TableField(value = "loadId")
-    @ApiModelProperty(value="装载号")
-    private Integer loadId;
-
-    /**
-     * 笼车内部号
-     */
-    @TableField(value = "cageId")
-    @ApiModelProperty(value="笼车内部号")
-    private Integer cageId;
-
-    /**
-     * 笼车号
-     */
-    @TableField(value = "cageCode")
-    @ApiModelProperty(value="笼车号")
-    private String cageCode;
-
-    /**
-     * 移入笼车时间
-     */
-    @TableField(value = "stagedAt")
-    @ApiModelProperty(value="移入笼车时间")
-    private Date stagedAt;
-
-    /**
-     * 移入笼车用户
-     */
-    @TableField(value = "stagedBy")
-    @ApiModelProperty(value="移入笼车用户")
-    private String stagedBy;
-
-    /**
      * 创建时间
      */
     @TableField(value = "created")
@@ -316,17 +262,6 @@ public class ShipmentContainerHeader implements Serializable {
     @ApiModelProperty(value="承运商")
     private String carrierCode;
  
-    @TableField(value = "scaledBy")
-    @ApiModelProperty(value="null")
-    private String scaledBy;
-
-    @TableField(value = "scaledAt")
-    @ApiModelProperty(value="null")
-    private Date scaledAt;
-
-    @TableField(value = "storeCode")
-    @ApiModelProperty(value="null")
-    private String storeCode;
  
     /**
      * 拍照图片id
@@ -381,8 +316,6 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_HEIGHT = "height";
  
-    public static final String COL_TOTALVALUE = "totalValue";
-
     public static final String COL_SHIPMENTID = "shipmentId";
  
     public static final String COL_COMPANYCODE = "companyCode";
@@ -397,15 +330,11 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_WAVEID = "waveId";
  
-    public static final String COL_COUNTINDEX = "countIndex";
-
-    public static final String COL_COUNTTOTAL = "countTotal";
-
     public static final String COL_TASKCREATED = "taskCreated";
  
     public static final String COL_SHIPMENTCODE = "shipmentCode";
  
-    public static final String COL_TRANSCONTCODE = "transContCode";
+    public static final String COL_TRANSCONTAINERCODE = "transContainerCode";
  
     public static final String COL_OQCBENCH = "oqcBench";
  
@@ -415,16 +344,6 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_OQCENDAT = "oqcEndAt";
  
-    public static final String COL_LOADID = "loadId";
-
-    public static final String COL_CAGEID = "cageId";
-
-    public static final String COL_CAGECODE = "cageCode";
-
-    public static final String COL_STAGEDAT = "stagedAt";
-
-    public static final String COL_STAGEDBY = "stagedBy";
-
     public static final String COL_CREATED = "created";
  
     public static final String COL_CREATEDBY = "createdBy";
@@ -443,12 +362,6 @@ public class ShipmentContainerHeader implements Serializable {
  
     public static final String COL_CARRIERCODE = "carrierCode";
  
-    public static final String COL_SCALEDBY = "scaledBy";
-
-    public static final String COL_SCALEDAT = "scaledAt";
-
-    public static final String COL_STORECODE = "storeCode";
-
     public static final String COL_PICURLS = "picUrls";
  
     public static final String COL_PIDIDS = "pidIds";
@@ -653,23 +566,6 @@ public class ShipmentContainerHeader implements Serializable {
         this.height = height;
     }
  
-    /**
-     * 获取价值
-     *
-     * @return totalValue - 价值
-     */
-    public BigDecimal getTotalValue() {
-        return totalValue;
-    }
-
-    /**
-     * 设置价值
-     *
-     * @param totalValue 价值
-     */
-    public void setTotalValue(BigDecimal totalValue) {
-        this.totalValue = totalValue;
-    }
  
     /**
      * 获取出库单内部号
@@ -788,42 +684,6 @@ public class ShipmentContainerHeader implements Serializable {
     }
  
     /**
-     * 获取货箱计数号
-     *
-     * @return countIndex - 货箱计数号
-     */
-    public Integer getCountIndex() {
-        return countIndex;
-    }
-
-    /**
-     * 设置货箱计数号
-     *
-     * @param countIndex 货箱计数号
-     */
-    public void setCountIndex(Integer countIndex) {
-        this.countIndex = countIndex;
-    }
-
-    /**
-     * 获取货箱计数总数
-     *
-     * @return countTotal - 货箱计数总数
-     */
-    public Integer getCountTotal() {
-        return countTotal;
-    }
-
-    /**
-     * 设置货箱计数总数
-     *
-     * @param countTotal 货箱计数总数
-     */
-    public void setCountTotal(Integer countTotal) {
-        this.countTotal = countTotal;
-    }
-
-    /**
      * 获取任务已创建？
      *
      * @return taskCreated - 任务已创建？
@@ -859,22 +719,12 @@ public class ShipmentContainerHeader implements Serializable {
         this.shipmentCode = shipmentCode;
     }
  
-    /**
-     * 获取周转箱号
-     *
-     * @return transContCode - 周转箱号
-     */
-    public String getTransContCode() {
-        return transContCode;
+    public String getTransContainerCode() {
+        return transContainerCode;
     }
  
-    /**
-     * 设置周转箱号
-     *
-     * @param transContCode 周转箱号
-     */
-    public void setTransContCode(String transContCode) {
-        this.transContCode = transContCode;
+    public void setTransContainerCode(String transContainerCode) {
+        this.transContainerCode = transContainerCode;
     }
  
     /**
@@ -949,95 +799,6 @@ public class ShipmentContainerHeader implements Serializable {
         this.oqcEndAt = oqcEndAt;
     }
  
-    /**
-     * 获取装载号
-     *
-     * @return loadId - 装载号
-     */
-    public Integer getLoadId() {
-        return loadId;
-    }
-
-    /**
-     * 设置装载号
-     *
-     * @param loadId 装载号
-     */
-    public void setLoadId(Integer loadId) {
-        this.loadId = loadId;
-    }
-
-    /**
-     * 获取笼车内部号
-     *
-     * @return cageId - 笼车内部号
-     */
-    public Integer getCageId() {
-        return cageId;
-    }
-
-    /**
-     * 设置笼车内部号
-     *
-     * @param cageId 笼车内部号
-     */
-    public void setCageId(Integer cageId) {
-        this.cageId = cageId;
-    }
-
-    /**
-     * 获取笼车号
-     *
-     * @return cageCode - 笼车号
-     */
-    public String getCageCode() {
-        return cageCode;
-    }
-
-    /**
-     * 设置笼车号
-     *
-     * @param cageCode 笼车号
-     */
-    public void setCageCode(String cageCode) {
-        this.cageCode = cageCode;
-    }
-
-    /**
-     * 获取移入笼车时间
-     *
-     * @return stagedAt - 移入笼车时间
-     */
-    public Date getStagedAt() {
-        return stagedAt;
-    }
-
-    /**
-     * 设置移入笼车时间
-     *
-     * @param stagedAt 移入笼车时间
-     */
-    public void setStagedAt(Date stagedAt) {
-        this.stagedAt = stagedAt;
-    }
-
-    /**
-     * 获取移入笼车用户
-     *
-     * @return stagedBy - 移入笼车用户
-     */
-    public String getStagedBy() {
-        return stagedBy;
-    }
-
-    /**
-     * 设置移入笼车用户
-     *
-     * @param stagedBy 移入笼车用户
-     */
-    public void setStagedBy(String stagedBy) {
-        this.stagedBy = stagedBy;
-    }
  
     /**
      * 获取创建时间
@@ -1201,47 +962,6 @@ public class ShipmentContainerHeader implements Serializable {
         this.carrierCode = carrierCode;
     }
  
-    /**
-     * @return scaledBy
-     */
-    public String getScaledBy() {
-        return scaledBy;
-    }
-
-    /**
-     * @param scaledBy
-     */
-    public void setScaledBy(String scaledBy) {
-        this.scaledBy = scaledBy;
-    }
-
-    /**
-     * @return scaledAt
-     */
-    public Date getScaledAt() {
-        return scaledAt;
-    }
-
-    /**
-     * @param scaledAt
-     */
-    public void setScaledAt(Date scaledAt) {
-        this.scaledAt = scaledAt;
-    }
-
-    /**
-     * @return storeCode
-     */
-    public String getStoreCode() {
-        return storeCode;
-    }
-
-    /**
-     * @param storeCode
-     */
-    public void setStoreCode(String storeCode) {
-        this.storeCode = storeCode;
-    }
  
     /**
      * 获取拍照图片id
@@ -6,10 +6,10 @@ import com.huaheng.common.exception.service.ServiceException;
 import com.huaheng.common.utils.security.ShiroUtils;
 import com.huaheng.framework.web.domain.AjaxResult;
 import com.huaheng.framework.web.domain.RetCode;
-import com.huaheng.pc.general.location.domain.Location;
-import com.huaheng.pc.general.location.service.LocationService;
-import com.huaheng.pc.general.material.domain.Material;
-import com.huaheng.pc.general.material.service.MaterialService;
+import com.huaheng.pc.config.location.domain.Location;
+import com.huaheng.pc.config.location.service.LocationService;
+import com.huaheng.pc.config.material.domain.Material;
+import com.huaheng.pc.config.material.service.MaterialService;
 import com.huaheng.pc.inventory.inventoryDetail.domain.InventoryDetail;
 import com.huaheng.pc.inventory.inventoryDetail.service.InventoryDetailService;
 import com.huaheng.pc.shipment.shipmentContainerDetail.domain.ShipmentContainerDetail;
@@ -21,7 +21,7 @@
 												出库单号：<input type="text" name="shipmentCode"/>
 											</li>
 											<li>
-												容器编号：<input type="text" name="shipmentContainerCode"/>
+												容器编号：<input type="text" name="containerCode"/>
 											</li>
 											<li>
 												库位编号：<input type="text" name="locationCode"/>
@@ -47,9 +47,9 @@
 											</li>
 											<li class="time">
 												<label>创建时间： </label>
-												<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+												<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
 												<span>-</span>
-												<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+												<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
 											</li>
 											<li>
 												<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -115,7 +115,7 @@
                     sortable:true
                 },
 				{
-					field : 'shipmentContainerCode', 
+					field : 'containerCode',
 					title : '容器编号',
 					sortable:true
 				},