Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

                                                                                      # Conflicts:
                                                                                      #	watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/sales_order_list.ftl

watero-rst-interface/src/main/java/com/iamberry/rst/faces/approval/ApprovalProductionService.java

@@ -1,6 +1,7 @@
 package com.iamberry.rst.faces.approval;
 
 import com.iamberry.rst.core.approval.ApprovalProduction;
+import com.iamberry.rst.core.approval.ApprovalProductionItem;
 
 import java.util.List;
 
@@ -18,4 +19,11 @@ public interface ApprovalProductionService {
      * @return  approvalProduction
      */
     ApprovalProduction  getApprovalProductionById(Integer  id);
+
+    /**
+     * 获取生产项集合
+     * @param  approvalProductionItem
+     * @return List
+     */
+    List<ApprovalProductionItem>  getApprovalProductionItemList(ApprovalProductionItem  approvalProductionItem);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/approval/ApprovalProductionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.iamberry.rst.service.approval;
 import com.iamberry.rst.core.approval.ApprovalProduction;
+import com.iamberry.rst.core.approval.ApprovalProductionItem;
 import com.iamberry.rst.faces.approval.ApprovalProductionService;
 import com.iamberry.rst.service.approval.mapper.ApprovalProductionMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,4 +35,14 @@ public class ApprovalProductionServiceImpl  implements ApprovalProductionService
     public  ApprovalProduction  getApprovalProductionById(Integer  id){
         return  approvalProductionMapper.getApprovalProductionById(id);
     }
+
+    /**
+     * 获取集合
+     * @param  approvalProductionItem
+     * @return List
+     */
+    @Override
+    public  List<ApprovalProductionItem>  getApprovalProductionItemList(ApprovalProductionItem  approvalProductionItem){
+        return  approvalProductionMapper.getApprovalProductionItemList(approvalProductionItem);
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.iamberry.rst.service.approval.mapper;
 
 import com.iamberry.rst.core.approval.ApprovalProduction;
+import com.iamberry.rst.core.approval.ApprovalProductionItem;
 
 import java.util.List;
 
@@ -22,4 +23,12 @@ public interface ApprovalProductionMapper {
      * @return  approvalProduction
      */
     ApprovalProduction  getApprovalProductionById(Integer  id);
+
+    /**
+     * 获取集合
+     * @param  approvalProductionItem
+     * @return List
+     */
+    List<ApprovalProductionItem>  getApprovalProductionItemList(ApprovalProductionItem  approvalProductionItem);
+
 }

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

@@ -90,4 +90,31 @@
         from tb_rst_approval_production t
         where t.production_id= #{productionId}
     </select>
+
+
+    <select id="getApprovalProductionItemList" resultType="ApprovalProductionItem" parameterType="ApprovalProductionItem" >
+        select
+          *
+        from tb_rst_approval_production_item t
+        <where>
+            <if test="itemId != null ">
+                AND t.item_id = #{itemId}
+            </if >
+            <if test="productionId != null ">
+                AND t.production_id = #{productionId}
+            </if >
+            <if test="productId != null ">
+                AND t.product_id = #{productId}
+            </if >
+            <if test="itemProductName != null and itemProductName != ''">
+                AND t.item_product_name  like  CONCAT ('%',#{itemProductName},'%')
+            </if >
+            <if test="itemColorName != null and itemColorName != ''">
+                AND t.item_color_name  like  CONCAT ('%',#{itemColorName},'%')
+            </if >
+            <if test="itemProductNum != null ">
+                AND t.item_product_num = #{itemProductNum}
+            </if >
+        </where>
+    </select>
 </mapper>

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

@@ -166,6 +166,7 @@ public class ApplyPickController {
         if(applyPickId == null){
            return new ResponseJson(500, "FAILURE", 500);
         }
+        ResponseJson rj = ResponseJson.getSUCCESS();
         ApprovalApplyPick approvalApplyPick = applyPickService.getApprovalApplyPickById(applyPickId);
 
         ApprovalApplyPickItem approvalApplyPickItem = new ApprovalApplyPickItem();
@@ -186,10 +187,14 @@ public class ApplyPickController {
         ApprovalProduction  ap = new ApprovalProduction();
         ap.setApprovalId(productionApprovalInfo.getApprovalId());
         List<ApprovalProduction> approvalProductionList = approvalProductionService.getApprovalProductionList(ap);
-
-//        approvalProductionService.get
-
-        ResponseJson rj = ResponseJson.getSUCCESS();
+        if(approvalProductionList != null && approvalProductionList.size() > 0 ){
+            ap = approvalProductionList.get(0);
+            ApprovalProductionItem approvalProductionItem = new ApprovalProductionItem();
+            approvalProductionItem.setProductionId(ap.getProductionId());
+            List<ApprovalProductionItem> approvalProductionItemList = approvalProductionService.getApprovalProductionItemList(approvalProductionItem);
+            ap.setListProductionItem(approvalProductionItemList);
+            rj.addResponseKeyValue("ApprovalProduction",ap);
+        }
         rj.addResponseKeyValue("approvalApplyPick",approvalApplyPick);
         rj.addResponseKeyValue("productionContractList",approvalProductionContractList);
         rj.addResponseKeyValue("approvalInfo",approvalInfo);