订单列表bug修复-----列表点击下一页size会增加

watero-rst-core/src/main/java/com.iamberry.rst.core/approval/ApprovalApplyPick.java

@@ -29,6 +29,10 @@ public class ApprovalApplyPick implements Serializable {
     private String applyPickReason;
     //提货状态1:未发货 2:已发货
     private Integer applyPickStruts;
+    //提货方式
+    private String applyPickShipWay;
+    //提货凭证
+    private String applyPickShipCertificate;
     //备注信息
     private String applyPickRemk;
     //创建时间
@@ -137,4 +141,20 @@ public class ApprovalApplyPick implements Serializable {
     public void setProductionApprovalId(Integer productionApprovalId) {
         this.productionApprovalId = productionApprovalId;
     }
+
+    public String getApplyPickShipWay() {
+        return applyPickShipWay;
+    }
+
+    public void setApplyPickShipWay(String applyPickShipWay) {
+        this.applyPickShipWay = applyPickShipWay;
+    }
+
+    public String getApplyPickShipCertificate() {
+        return applyPickShipCertificate;
+    }
+
+    public void setApplyPickShipCertificate(String applyPickShipCertificate) {
+        this.applyPickShipCertificate = applyPickShipCertificate;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/mapper/applyPickMapper.xml

@@ -167,6 +167,9 @@
             <if test="applyPickStruts != null ">
                 apply_pick_struts = #{applyPickStruts},
             </if >
+            <if test="applyPickShipCertificate != null ">
+                apply_pick_ship_certificate = #{applyPickShipCertificate},
+            </if >
             <if test="applyPickRemk != null and applyPickRemk != ''">
                 apply_pick_remk = #{applyPickRemk},
             </if >

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/SalesOrderServiceImpl.java

@@ -141,6 +141,7 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         }
         result.setPages(count);
         result.setPageNo(pageNO);
+        result.setPageSize(pageSize);
         return result;
     }
 

watero-rst-web/src/main/java/com/iamberry/rst/controllers/approval/ApplyPickController.java

@@ -202,4 +202,32 @@ public class ApplyPickController {
         return rj;
     }
 
+    /**
+     * 发货
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping("/ship")
+    public ResponseJson ship(HttpServletRequest request,Integer applyPickId, String applyPickShipWay,String applyPickCertificate) {
+        if(applyPickId == null || applyPickCertificate == null || "".equals(applyPickCertificate) ){
+            return new ResponseJson(500, "FAILURE", 500);
+        }
+        if(applyPickCertificate == null || "".equals(applyPickCertificate) ){
+            return new ResponseJson(500, "FAILURE", 500);
+        }
+        if(applyPickCertificate == null || "".equals(applyPickCertificate) ){
+            return new ResponseJson(500, "FAILURE", 500);
+        }
+        ResponseJson rj = ResponseJson.getSUCCESS();
+        ApprovalApplyPick approvalApplyPick = new ApprovalApplyPick();
+        approvalApplyPick.setApplyPickStruts(2);
+        approvalApplyPick.setApplyPickId(applyPickId);
+//        approvalApplyPick.(applyPickCertificate);
+        Integer flag = applyPickService.update(approvalApplyPick);
+        if(flag < 1){
+            return new ResponseJson(500, "FAILURE", 500);
+        }
+        return rj;
+    }
+
 }