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

周鸿
2 parents e2dea5eb e9e39e5b
Showing 13 changed files with 278 additions and 177 deletions
src/main/java/com/huaheng/common/constant/QuantityConstant.java
src/main/java/com/huaheng/pc/monitor/job/task/RyTask.java
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
src/main/java/com/huaheng/pc/shipment/shipmentHeader/controller/ShipmentHeaderController.java
src/main/java/com/huaheng/pc/task/taskDetail/domain/TaskDetail.java
src/main/java/com/huaheng/pc/task/taskHeader/controller/TaskHeaderController.java
src/main/java/com/huaheng/pc/task/taskHeader/domain/TaskBackDomain.java
src/main/java/com/huaheng/pc/task/taskHeader/service/TaskBackQueue.java
src/main/resources/mybatis/shipment/ShipmentDetailMapper.xml
src/main/resources/templates/receipt/receiptHeader/receiptHeader.html
src/main/resources/templates/shipment/shipmentDetail/add.html
src/main/resources/templates/shipment/shipmentHeader/add.html
src/main/resources/templates/task/taskHeader/taskHeaderV.html
@@ -463,6 +463,7 @@ public class QuantityConstant {
     public static String U8_RECEIPT_TYPE_PI = "PI";
     public static String U8_RECEIPT_TYPE_SRI = "SRI";
  
+    public static String SHIPMENT_TYPE_PO = "PO";
     public static String U8_SHIPMENT_TYPE_OO = "OO";
     public static String U8_SHIPMENT_TYPE_MO = "MO";
     public static String U8_SHIPMENT_TYPE_SO = "SO";
@@ -40,9 +40,11 @@ import com.huaheng.pc.receipt.receiptContainerDetail.domain.ReceiptContainerDeta
 import com.huaheng.pc.receipt.receiptContainerDetail.service.ReceiptContainerDetailService;
 import com.huaheng.pc.receipt.receiptContainerHeader.service.ReceiptContainerHeaderService;
 import com.huaheng.pc.receipt.receiptDetail.service.ReceiptDetailService;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
 import com.huaheng.pc.receipt.receiptHeaderHistory.service.ReceiptHeaderHistoryService;
 import com.huaheng.pc.shipment.shipmentContainerHeader.service.ShipmentContainerHeaderService;
+import com.huaheng.pc.shipment.shipmentHeader.domain.ShipmentHeader;
 import com.huaheng.pc.shipment.shipmentHeader.service.ShipmentHeaderService;
 import com.huaheng.pc.task.taskDetail.service.TaskDetailService;
 import com.huaheng.pc.task.taskHeader.domain.TaskHeader;
@@ -373,4 +375,37 @@ public class RyTask extends BaseController {
             }
         }
     }
+
+    /**
+     * 手持入库/出库进入历史单
+     */
+    public void putHistory(){
+        LambdaQueryWrapper<ReceiptHeader> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ReceiptHeader::getReceiptType,QuantityConstant.RECEIPT_TYPE_PPI)
+                .eq(ReceiptHeader::getFirstStatus,QuantityConstant.RECEIPT_HEADER_POSTING)
+                .eq(ReceiptHeader::getLastStatus,QuantityConstant.RECEIPT_HEADER_POSTING)
+                .eq(ReceiptHeader::getDeleted,false);
+        List<ReceiptHeader> list = receiptHeaderService.list(queryWrapper);
+        for (ReceiptHeader receiptHeader : list) {
+            receiptHeader.setDeleted(true);
+        }
+        if(!list.isEmpty()){
+            receiptHeaderService.updateBatchById(list);
+        }
+
+        LambdaQueryWrapper<ShipmentHeader> queryWrapper1 = Wrappers.lambdaQuery();
+        queryWrapper1.eq(ShipmentHeader::getShipmentType,QuantityConstant.SHIPMENT_TYPE_PO)
+                .eq(ShipmentHeader::getFirstStatus,QuantityConstant.SHIPMENT_HEADER_COMPLETED)
+                .eq(ShipmentHeader::getLastStatus,QuantityConstant.SHIPMENT_HEADER_COMPLETED)
+                .eq(ShipmentHeader::getDeleted,false);
+        List<ShipmentHeader> list1 = shipmentHeaderService.list(queryWrapper1);
+        for (ShipmentHeader shipmentHeader : list1) {
+            shipmentHeader.setDeleted(true);
+        }
+        if(!list1.isEmpty()){
+            shipmentHeaderService.updateBatchById(list1);
+        }
+    }
+
+
 }
@@ -111,10 +111,11 @@ public class ReceiptHeaderController extends BaseController {
 //                .like(StringUtils.isNotEmpty(receiptHeader.getSupplierName()), ReceiptHeader::getCode, receiptHeader.getCode())
                 .eq(StringUtils.isNotEmpty(receiptHeader.getCreatedBy()), ReceiptHeader::getCreatedBy, receiptHeader.getCreatedBy())
                 .eq(StringUtils.isNotEmpty(receiptHeader.getReferCode()), ReceiptHeader::getReferCode, receiptHeader.getReferCode())
+                .eq( ReceiptHeader::getDeleted,false)
                 .notIn(ReceiptHeader::getReceiptType,QuantityConstant.U8_RECEIPT_TYPE_PCI)
-                .le(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
+                .eq(StringUtils.isNotNull(receiptHeader.getFirstStatus()),
                  ReceiptHeader::getFirstStatus, receiptHeader.getFirstStatus())
-                .ge(StringUtils.isNotNull(receiptHeader.getLastStatus()),
+                .eq(StringUtils.isNotNull(receiptHeader.getLastStatus()),
                         ReceiptHeader::getLastStatus, receiptHeader.getLastStatus());
         if(StringUtils.isNotEmpty(receiptHeader.getSupplierCode())){
             lambdaQueryWrapper.apply(" supplierCode in(select code from supplier where name like '%"+receiptHeader.getSupplierCode()+"%' )");
@@ -103,6 +103,7 @@ public class ShipmentHeaderController extends BaseController {
 				.in(StringUtils.isEmpty(shipmentHeader.getCompanyCode()), ShipmentHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getCode()),ShipmentHeader::getCode,shipmentHeader.getCode())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getShipmentType()),ShipmentHeader::getShipmentType,shipmentHeader.getShipmentType())
+				.notIn(ShipmentHeader::getShipmentType,"OO")
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCode()), ShipmentHeader::getReferCode, shipmentHeader.getReferCode())
 				.eq(StringUtils.isNotEmpty(shipmentHeader.getReferCodeType()), ShipmentHeader::getReferCodeType, shipmentHeader.getReferCodeType())
 				.eq(shipmentHeader.getFirstStatus()!=null, ShipmentHeader::getFirstStatus, shipmentHeader.getFirstStatus())
@@ -387,6 +387,10 @@ public class TaskDetail implements Serializable {
     @TableField(value = "billId")
     private Integer billId;
  
+    /** back 回传 */
+    @TableField(value = "back")
+    private Integer back;
+
     private static final long serialVersionUID = 1L;
  
 }
 \ No newline at end of file
@@ -112,6 +112,7 @@ public class TaskHeaderController extends BaseController {
                 .eq(StringUtils.isNotNull(taskHeader.getPriority()),TaskHeader::getPriority,taskHeader.getPriority())
                 .gt(StringUtils.isNotEmpty(createdBegin),TaskHeader::getCreated,createdBegin)
                 .lt(StringUtils.isNotEmpty(createdEnd),TaskHeader::getCreated,createdEnd)
+                .eq(StringUtils.isNotNull(taskHeader.getIsReturn()),TaskHeader::getIsReturn,taskHeader.getIsReturn())
                 .orderByAsc(TaskHeader::getStatus)
                 .orderByDesc(TaskHeader::getId);
  
@@ -23,7 +23,7 @@ public class TaskBackDomain {
     /**
      * 上架任务 or 出库任务
      */
-    private int type;
+    private Integer type;
  
     public boolean getIsSuc() {
         return isSuc;
@@ -52,11 +52,11 @@ public class TaskBackDomain {
         return this;
     }
  
-    public int getType() {
+    public Integer getType() {
         return type;
     }
  
-    public TaskBackDomain setType(int type) {
+    public TaskBackDomain setType(Integer type) {
         this.type = type;
         return this;
     }
@@ -48,9 +48,6 @@ public class TaskBackQueue implements BackQueue{
                 .setBackNum(QuantityConstant.ISRETURN_FAIL);
  
         AjaxResult ajaxResult = AjaxResult.success();
-        boolean flag = true;
-        String  message = "成功";
-        Integer result = 0;
         if(StringUtils.isNull(taskId)){
  
             callBack.back(domain.setMsg("任务id不能为空"));
@@ -103,11 +100,26 @@ public class TaskBackQueue implements BackQueue{
                         callBack.back(domain);
                         return;
                     }
+                    if(taskAllComplete(receiptHeader.getCode())){
+                        continue;
+                    }
                     receiptHeaderId = receiptHeader.getId().toString();
-                    ajaxResult = receiptHeaderService.postBack(receiptHeaderId, detailsQtyMap);
+                    //获取未回传任务集
+                    List<TaskDetail> unBackTask = getUnBackTask(receiptHeader.getCode());
+                    if(unBackTask.size()==0){
+                        continue;
+                    }
+                    Map<Integer, BigDecimal> taskFinishMaps = getTaskFinishMaps(unBackTask);
+                    ajaxResult = receiptHeaderService.postBack(receiptHeaderId, taskFinishMaps);
+                    if(!ajaxResult.hasErr()){
+                        for (TaskDetail taskDetail : unBackTask) {
+                            taskDetail.setBack(1);
+                        }
+                        taskDetailService.updateBatchById(unBackTask);
+                    }
                     backMsg.put(receiptHeader.getCode(),ajaxResult.getMsg());
+                    type = 1;
                 }
-                type = 1;
                 break;
             case 200 :
                 String shipmentHeaderId = "";
@@ -123,17 +135,62 @@ public class TaskBackQueue implements BackQueue{
                         domain.setIsSuc(true).setMsg("无需回传").setBackNum(QuantityConstant.NOT_RETURN);
                         return;
                     }
+                    if(taskAllComplete(shipmentHeader.getCode())){
+                        continue;
+                    }
                     shipmentHeaderId = shipmentHeader.getId().toString();
-                    ajaxResult = shipmentHeaderService.postBack(shipmentHeaderId,detailsQtyMap);
+                    //获取未回传任务集
+                    List<TaskDetail> unBackTask = getUnBackTask(shipmentHeader.getCode());
+                    if(unBackTask.size()==0){
+                        continue;
+                    }
+                    Map<Integer, BigDecimal> taskFinishMaps = getTaskFinishMaps(unBackTask);
+                    ajaxResult = shipmentHeaderService.postBack(shipmentHeaderId,taskFinishMaps);
+                    if(!ajaxResult.hasErr()){
+                        for (TaskDetail taskDetail : unBackTask) {
+                            taskDetail.setBack(1);
+                        }
+                        taskDetailService.updateBatchById(unBackTask);
+                    }
                     backMsg.put(shipmentHeader.getCode(),ajaxResult.getMsg());
+                    type = 2;
                 }
-                type = 2;
                 break;
         }
-        flag = !ajaxResult.hasErr();
-        message = ajaxResult.getMsg();
-        result = flag ?  QuantityConstant.ISRETURN_SUCC : QuantityConstant.ISRETURN_FAIL;
+        boolean flag = !ajaxResult.hasErr();
+        String  message = ajaxResult.getMsg();
+        Integer result = flag ?  QuantityConstant.ISRETURN_SUCC : QuantityConstant.ISRETURN_FAIL;
         domain.setIsSuc(flag).setMsg(message).setBackNum(result).setType(type).setMsgMaps(backMsg);
         callBack.back(domain);
     }
+
+    private boolean taskAllComplete(String billCode){
+        LambdaQueryWrapper<TaskDetail> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(TaskDetail::getBillCode,billCode)
+                .lt(TaskDetail::getStatus,QuantityConstant.TASK_STATUS_COMPLETED);
+        List<TaskDetail> taskDetails = taskDetailService.list(queryWrapper);
+        return !taskDetails.isEmpty();
+    }
+
+    private Map<Integer, BigDecimal> getTaskFinishMaps(List<TaskDetail> taskDetails){
+        Map<Integer, BigDecimal> map = new HashMap<>();
+        for (TaskDetail taskDetail : taskDetails) {
+            if(StringUtils.isNull(map.get(taskDetail.getBillDetailId()))){
+                map.put(taskDetail.getBillDetailId(),taskDetail.getQty());
+            }else{
+                map.put(taskDetail.getBillDetailId(),map.get(taskDetail.getBillDetailId()).add(taskDetail.getQty()));
+            }
+        }
+        return map;
+    }
+
+    private List<TaskDetail> getUnBackTask(String billCode){
+        LambdaQueryWrapper<TaskDetail> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(TaskDetail::getBillCode,billCode)
+                .eq(TaskDetail::getStatus,QuantityConstant.TASK_STATUS_COMPLETED)
+                .eq(TaskDetail::getBack,0);
+        List<TaskDetail> taskDetails = taskDetailService.list(queryWrapper);
+        return taskDetails;
+    }
+
 }
@@ -45,6 +45,7 @@
     <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
       <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
       <result column="moCode" jdbcType="VARCHAR" property="moCode" />
+      <result column="autoId" jdbcType="INTEGER" property="autoId" />
       <result column="backQty" jdbcType="DECIMAL" property="backQty" />
   </resultMap>
   <sql id="Base_Column_List">
@@ -146,7 +147,7 @@ ORDER BY
     materialCode, materialName, materialSpec, materialUnit, qty, allocationRule,
     replenishmentRule, pickLocs, attribute1, attribute2, attribute3, attribute4, batch,
     lot, projectNo, manufactureDate, expirationDate, agingDate, inventorySts, dockLoc,
-    packingClass, waveId, created, createdBy, lastUpdatedBy,moCode,backQty
+    packingClass, waveId, created, createdBy, lastUpdatedBy,moCode,backQty,autoId
     )
     values
     <foreach collection="shipmentDetails" item="item" index="index" separator=",">
@@ -157,7 +158,7 @@ ORDER BY
       #{item.pickLocs}, #{item.attribute1}, #{item.attribute2}, #{item.attribute3}, #{item.attribute4}, #{item.batch},
       #{item.lot}, #{item.projectNo}, #{item.manufactureDate}, #{item.expirationDate}, #{item.agingDate},
       #{item.inventorySts}, #{item.dockLoc},#{item.packingClass}, #{item.waveId}, #{item.created}, #{item.createdBy},
-      #{item.lastUpdatedBy},#{item.moCode},#{item.backQty}
+      #{item.lastUpdatedBy},#{item.moCode},#{item.backQty},#{item.autoId}
     )
     </foreach>
   </insert>
@@ -729,8 +729,8 @@
                 $('#referType').val(value.data.referType);
                 $('#receiptTotalQty').val(value.data.totalQty);
                 $('#receiptTotalLines').val(value.data.totalLines);
-                $('#receiptFirstStatus').val(receiptHeaderStatus.filter(function (e) {return e.dictValue==value.data.firstStatus})[0].dictLabel);
-                $('#receiptLastStatus').val(receiptHeaderStatus.filter(function (e) {return e.dictValue==value.data.lastStatus})[0].dictLabel);
+                $('#firstStatus').val(receiptHeaderStatus.filter(function (e) {return e.dictValue==value.data.firstStatus})[0].dictLabel);
+                $('#lastStatus').val(receiptHeaderStatus.filter(function (e) {return e.dictValue==value.data.lastStatus})[0].dictLabel);
                 $('#receiptSupplierCode').val(value.data.supplierCode);
                 $('#receiptAppointmentTime').val(value.data.appointmentTime);
                 $('#receiptStation').val(value.data.receiptStation);
@@ -44,34 +44,34 @@
                 选择物料
             </a>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">物料名称：</label>
-            <div class="col-sm-8">
-                <input id="materialName" name="materialName" class="form-control" type="text" readonly="readonly">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">物料规格：</label>
-            <div class="col-sm-8">
-                <input id="materialSpec" name="materialSpec" class="form-control" type="text" readonly="readonly">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">物料单位：</label>
-            <div class="col-sm-8">
-                <input id="materialUnit" name="materialUnit" class="form-control" type="text" readonly="readonly">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">库存状态：</label>
-            <div class="col-sm-8">
-                <select id="inventorySts" name="inventorySts" class="form-control"
-                        th:with="inventorySts=${@dict.getType('inventorySts')}">
-                    <option th:each="dict : ${inventorySts}" th:text="${dict['dictLabel']}"
-                            th:value="${dict['dictValue']}"></option>
-                </select>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">物料名称：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="materialName" name="materialName" class="form-control" type="text" readonly="readonly">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">物料规格：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="materialSpec" name="materialSpec" class="form-control" type="text" readonly="readonly">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">物料单位：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="materialUnit" name="materialUnit" class="form-control" type="text" readonly="readonly">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">库存状态：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <select id="inventorySts" name="inventorySts" class="form-control"-->
+<!--                        th:with="inventorySts=${@dict.getType('inventorySts')}">-->
+<!--                    <option th:each="dict : ${inventorySts}" th:text="${dict['dictLabel']}"-->
+<!--                            th:value="${dict['dictValue']}"></option>-->
+<!--                </select>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label">发货数量：</label>
             <div class="col-sm-8">
@@ -79,89 +79,89 @@
                        onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
             </div>
         </div>
-      <!--  <div class="form-group">
+        <div class="form-group">
             <label class="col-sm-3 control-label">工作令号：</label>
             <div class="col-sm-8">
                 <input id="moCode" name="moCode" class="form-control" type="text">
             </div>
-        </div>-->
-        <div class="form-group">
-            <label class="col-sm-3 control-label">出库口：</label>
-            <div class="col-sm-8">
-                <select id="port" name="port" class="form-control"></select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">批次：</label>
-            <div class="col-sm-8">
-                <input id="batch" name="batch" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">批号：</label>
-            <div class="col-sm-8">
-                <input id="lot" name="lot" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">项目号：</label>
-            <div class="col-sm-8">
-                <input id="projectNo" name="project" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">上游系统行号：</label>
-            <div class="col-sm-8">
-                <input id="referLineNum" name="referLineNum" class="form-control" type="text"
-                       onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">分配规则：</label>
-            <div class="col-sm-8">
-                <select id="allocationRule" class="form-control"
-                        th:with="allocationRule=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">
-                    <option value=" " checked></option>
-                    <option th:each="allocationRules:${allocationRule}" th:text="${allocationRules['description']}"
-                            th:value="${allocationRules['code']}"></option>
-                </select>
-            </div>
-        </div>
-        <!--<div class="form-group">-->
-        <!--<label class="col-sm-3 control-label">分配规则：</label>-->
-        <!--<div class="col-sm-8">-->
-        <!--<input id="allocationRule" name="allocationRule" class="form-control" type="text">-->
-        <!--</div>-->
-        <!--</div>-->
-        <div class="form-group">
-            <label class="col-sm-3 control-label">补货规则：</label>
-            <div class="col-sm-8">
-                <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">拣货规则：</label>
-            <div class="col-sm-8">
-                <select id="pickingRule" class="form-control"
-                        th:with="pickingRule=${@FilterConfigDetailService.queryFilterConfigDetail('shipmentPickingRule')}">
-                    <option value=" " checked></option>
-                    <option th:each="pickingRules:${pickingRule}" th:text="${pickingRules['description']}"
-                            th:value="${pickingRules['code']}"></option>
-                </select>
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">生产日期：</label>
-            <div class="col-sm-8">
-                <input id="manufactureDate" name="manufactureDate" class="form-control" type="text">
-            </div>
-        </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label">失效日期：</label>
-            <div class="col-sm-8">
-                <input id="expirationDate" name="expirationDate" class="form-control" type="text">
-            </div>
         </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">出库口：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <select id="port" name="port" class="form-control"></select>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">批次：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="batch" name="batch" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">批号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="lot" name="lot" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">项目号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="projectNo" name="project" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">上游系统行号：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="referLineNum" name="referLineNum" class="form-control" type="text"-->
+<!--                       onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">分配规则：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <select id="allocationRule" class="form-control"-->
+<!--                        th:with="allocationRule=${@FilterConfigDetailService.queryFilterConfigDetail('allocationRule')}">-->
+<!--                    <option value=" " checked></option>-->
+<!--                    <option th:each="allocationRules:${allocationRule}" th:text="${allocationRules['description']}"-->
+<!--                            th:value="${allocationRules['code']}"></option>-->
+<!--                </select>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        &lt;!&ndash;<div class="form-group">&ndash;&gt;-->
+<!--        &lt;!&ndash;<label class="col-sm-3 control-label">分配规则：</label>&ndash;&gt;-->
+<!--        &lt;!&ndash;<div class="col-sm-8">&ndash;&gt;-->
+<!--        &lt;!&ndash;<input id="allocationRule" name="allocationRule" class="form-control" type="text">&ndash;&gt;-->
+<!--        &lt;!&ndash;</div>&ndash;&gt;-->
+<!--        &lt;!&ndash;</div>&ndash;&gt;-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">补货规则：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="replenishmentRule" name="replenishmentRule" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">拣货规则：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <select id="pickingRule" class="form-control"-->
+<!--                        th:with="pickingRule=${@FilterConfigDetailService.queryFilterConfigDetail('shipmentPickingRule')}">-->
+<!--                    <option value=" " checked></option>-->
+<!--                    <option th:each="pickingRules:${pickingRule}" th:text="${pickingRules['description']}"-->
+<!--                            th:value="${pickingRules['code']}"></option>-->
+<!--                </select>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">生产日期：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="manufactureDate" name="manufactureDate" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label">失效日期：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input id="expirationDate" name="expirationDate" class="form-control" type="text">-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <div class="form-control-static col-sm-offset-9">
                 <button type="submit" class="btn btn-primary">提交</button>
@@ -11,7 +11,7 @@
 			<div class="form-group">
 				<label class="col-sm-3 control-label">出库单类型：</label>
 				<div class="col-sm-8">
-                    <select id="shipmentType" class="form-control" th:with="shipmentType=${@ShipmentTypeService.getType()}">
+                    <select id="shipmentType" name="shipmentType" class="form-control" th:with="shipmentType=${@ShipmentTypeService.getType()}">
                         <option  th:each="dict : ${shipmentType}" th:text="${dict['name']}" th:value="${dict['code']}"></option>
                     </select>
 				</div>
@@ -29,55 +29,55 @@
 				<label class="col-sm-3 control-label">货主：</label>
 				<div class="col-sm-8">
 					<select id = "companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.selectCompanyByCurrentUserId()}">
-						<option  th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}"  th:attr = " code = ${item['code']}"></option>
+						<option  th:each="item : ${list}" th:text="${item['name']}" th:value="${item['code']}"  th:attr = " code = ${item['code']}"></option>
 					</select>
 				</div>
 			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上游订单号：</label>
-				<div class="col-sm-8">
-					<input id="referCode" name="referCode" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">上游平台：</label>
-				<div class="col-sm-8">
-					<input id="referPlatform" name="referPlatform" class="form-control" type="text">
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">客户编码：</label>
-				<div class="col-sm-8">
-					<select id="customerCode" name="customerCode" class="form-control"></select>
-				</div>
-			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">发货站台：</label>
-				<div class="col-sm-8">
-					<!--<input id="station" name="station" class="form-control" type="text">-->
-					<select id="station" name="station" class="form-control" th:with="station=${@dict.getType('station')}">
-						<option th:each="dict : ${station}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
-					</select>
-				</div>
-			</div>
-			<div class="form-group">	
-				<label class="col-sm-3 control-label">优先级(0-99)：</label>
-				<div class="col-sm-8">
-					<input id="priority" name="priority" class="form-control" type="text">
-				</div>
-			</div>
+<!--			<div class="form-group">	-->
+<!--				<label class="col-sm-3 control-label">上游订单号：</label>-->
+<!--				<div class="col-sm-8">-->
+<!--					<input id="referCode" name="referCode" class="form-control" type="text">-->
+<!--				</div>-->
+<!--			</div>-->
+<!--			<div class="form-group">	-->
+<!--				<label class="col-sm-3 control-label">上游平台：</label>-->
+<!--				<div class="col-sm-8">-->
+<!--					<input id="referPlatform" name="referPlatform" class="form-control" type="text">-->
+<!--				</div>-->
+<!--			</div>-->
+<!--			<div class="form-group">-->
+<!--				<label class="col-sm-3 control-label">客户编码：</label>-->
+<!--				<div class="col-sm-8">-->
+<!--					<select id="customerCode" name="customerCode" class="form-control"></select>-->
+<!--				</div>-->
+<!--			</div>-->
+<!--			<div class="form-group">-->
+<!--				<label class="col-sm-3 control-label">发货站台：</label>-->
+<!--				<div class="col-sm-8">-->
+<!--					&lt;!&ndash;<input id="station" name="station" class="form-control" type="text">&ndash;&gt;-->
+<!--					<select id="station" name="station" class="form-control" th:with="station=${@dict.getType('station')}">-->
+<!--						<option th:each="dict : ${station}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>-->
+<!--					</select>-->
+<!--				</div>-->
+<!--			</div>-->
+<!--			<div class="form-group">	-->
+<!--				<label class="col-sm-3 control-label">优先级(0-99)：</label>-->
+<!--				<div class="col-sm-8">-->
+<!--					<input id="priority" name="priority" class="form-control" type="text">-->
+<!--				</div>-->
+<!--			</div>-->
 			<div class="form-group">
 				<label class="col-sm-3 control-label">备注：</label>
 				<div class="col-sm-8">
 					<input id="remark" name="remark" class="form-control" type="text">
 				</div>
 			</div>
-			<div class="form-group">
-				<label class="col-sm-3 control-label">要求到货时间：</label>
-				<div class="col-sm-8">
-					<input id="requestedDeliveryDate" name="requestedDeliveryDate" class="form-control" type="text">
-				</div>
-			</div>
+<!--			<div class="form-group">-->
+<!--				<label class="col-sm-3 control-label">要求到货时间：</label>-->
+<!--				<div class="col-sm-8">-->
+<!--					<input id="requestedDeliveryDate" name="requestedDeliveryDate" class="form-control" type="text">-->
+<!--				</div>-->
+<!--			</div>-->
 			<!--<div class="form-group">-->
 				<!--<label class="col-sm-3 control-label">是否有效：</label>-->
 				<!--<div class="col-sm-8">-->
@@ -139,17 +139,7 @@
                     cache: true,
                     type: "POST",
                     url: prefix + "/add",
-                    data: {
-                        "shipmentType": $("#shipmentType option:selected").val(),
-						"companyCode": $("#companyCode option:selected").attr("code"),
-                        "referCode": $("input[name='referCode']").val(),
-                        "referPlatform": $("input[name='referPlatform']").val(),
-						"customerCode":  $("#customerCode option:selected").val(),
-                        "priority": $("input[name='priority']").val(),
-                        "requestedDeliveryDate": $("input[name='requestedDeliveryDate']").val(),
-						"remark": $("input[name='remark']").val(),
-						"uWarehouseCode":  $("#uWarehouseCode option:selected").val(),
-                    },
+                    data: $("#form-shipmentHeader-add").serializeArray(),
                     async: false,
                     error: function (request) {
                         $.modal.alertError("请求失败！");
@@ -75,6 +75,16 @@
 									</li>
  
 									<li>
+										回传状态：
+										<select id="isReturn" name="isReturn">
+											<option value="">所有</option>
+											<option value="1">失败</option>
+											<option value="2">成功</option>
+											<option value="3">其他</option>
+										</select>
+									</li>
+
+									<li>
 										<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 										<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset('task-form')"><i class="fa fa-refresh"></i>&nbsp;重置</a>
 										<!--<a class="btn btn-success btn-rounded btn-sm" onclick="$.table.exportExcel()" shiro:hasPermission="receipt:receiptHeader:export"><i class="fa fa-download"></i>&nbsp;导出</a>-->