仓储列表功能

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/ComplaintSignclosedInfoService.java

@@ -50,4 +50,10 @@ public interface ComplaintSignclosedInfoService {
      * @return
      */
     PagedResult<ComplaintSignclosedInfo> listSignclosed(PageRequest<ComplaintSignclosedInfo> pageRequest);
+
+    /**
+     * 转入品质
+     * @return
+     */
+    int intoComplaint(Integer signclosedId);
 }

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

@@ -31,6 +31,8 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
     private ComplaintSignclosedProductInfoMapper complaintSignclosedProductInfoMapper;
     @Autowired
     private FittingsInfoMapper fittingsInfoMapper;
+    @Autowired
+    private ComplaintDetectInfoMapper complaintDetectInfoMapper;
 
     @Override
     @Transactional
@@ -214,4 +216,25 @@ public class ComplaintSignclosedInfoServiceImpl implements ComplaintSignclosedIn
 
     }
 
+    @Override
+    public int intoComplaint(Integer signclosedId) {
+        Integer msg = 0;
+        try {
+            ComplaintSignclosedInfo info = complaintSignclosedInfoMapper.getSignclosedById(signclosedId);
+            ComplaintDetectInfo complaintDetectInfo = new ComplaintDetectInfo();
+            complaintDetectInfo.setSignclosedId(info.getSignclosedId());
+            complaintDetectInfo.setDetectState(2);
+            msg = complaintDetectInfoMapper.updateComplaintDetectById(complaintDetectInfo);
+            if(msg != 0){
+                ComplaintSignclosedInfo complaintSignclosedInfo = new ComplaintSignclosedInfo();
+                complaintSignclosedInfo.setSignclosedId(info.getSignclosedId());
+                complaintSignclosedInfo.setSignclosedIsInto(1);
+                complaintSignclosedInfoMapper.updateSignclosedById(complaintSignclosedInfo);
+            }
+        }catch(Exception e) {
+            return msg;
+        }
+        return msg;
+    }
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/complaintDetectInfoMapper.xml

@@ -164,6 +164,13 @@
         maintenance_results = #{maintenanceResults,jdbcType=BIT}
       </if>
     </set>
-    where detect_id = #{detectId,jdbcType=INTEGER}
+    <where>
+      <if test="detectId != null and detectId != ''" >
+        AND detect_id = #{detectId,jdbcType=INTEGER}
+      </if>
+      <if test="signclosedId != null and signclosedId != ''" >
+        AND signclosed_id = #{signclosedId,jdbcType=INTEGER}
+      </if>
+    </where>
   </update>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminSignclosedController.java

@@ -298,5 +298,31 @@ public class AdminSignclosedController {
         mv.addObject("complaintSignclosedInfo",complaintSignclosedInfo);
         return mv;
     }
+    /**
+     * 转入品质
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequiresPermissions("signclosed:update:signclosed")
+    @RequestMapping(value = "/into_complaint")
+    public ResponseJson intoComplaint(HttpServletRequest request,Integer signclosedId){
+        ResponseJson msg = new ResponseJson();
+        if(signclosedId == null){
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+            return msg;
+        }
+        Integer num = complaintSignclosedInfoService.intoComplaint(signclosedId);
+        if (num < 1) {
+            msg.setResultCode(500);
+            msg.setReturnCode(500);
+        } else {
+            msg.setResultCode(200);
+            msg.setReturnCode(200);
+        }
+        return msg;
+    }
+
 }
 

watero-rst-web/src/main/webapp/WEB-INF/views/cm/signclosed/signclosed_list.ftl

@@ -198,10 +198,12 @@
                     <td class="text-c" width="100">${signclosed.signclosedDesc!}</td>
                     <!-- 遍历操作 -->
                     <td class="td-manage text-c">
-                        <a style="text-decoration:none" href="javascript:;" title="签收"
-                           onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosedId!''}');">
-                            <i class="Hui-iconfont">&#xe6df;</i>
-                        </a>
+                        <#if signclosed.signclosedState == 2>
+                            <a style="text-decoration:none" href="javascript:;" title="签收"
+                               onclick="update_info('${path}/admin/signclosed/to_complete_signclosed?signclosedId=${signclosedId!''}');">
+                                <i class="Hui-iconfont">&#xe6df;</i>
+                            </a>
+                        </#if>
                         <a style="text-decoration:none" href="javascript:;" title="修改备注"
                            onclick="add_remark('修改备注','${path}/admin/signclosed/to_update_remark?signclosedId=${signclosedId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe692;</i>
@@ -210,6 +212,13 @@
                            onclick="add_remark('修改寄件人信息','${path}/admin/signclosed/to_update_sender?signclosedId=${signclosedId!''}','570','450');">
                             <i class="Hui-iconfont">&#xe60c;</i>
                         </a>
+                        <#if signclosed.signclosedIsInto == 2>
+                            <a style="text-decoration:none" href="javascript:;" title="转入品检"
+                               onclick="into_complaint('${signclosedId!''}');">
+                                <i class="Hui-iconfont">&#xe644;</i>
+                            </a>
+                        </#if>
+
                     </td>
                 </tr>
                 </#list>
@@ -236,6 +245,31 @@
     function update_info(url){
         window.location.href = url;
     }
+    /*转入品检*/
+    function into_complaint(signclosedId){
+        layer.alert('确定转入到品检部门吗？', function () {
+            $.ajax({
+                cache: true,
+                type: "POST",
+                url: "${path}/admin/signclosed/into_complaint",
+                data:{"signclosedId":signclosedId},
+                async: false,
+                success: function(data){
+                    if (data.returnCode == 200) {
+                        layer.msg('转入成功',{icon: 1,time:1000},function () {
+                            location.replace(location.href);
+                        });
+                    } else {
+                        layer.msg('转入失败',{icon: 5,time:1000});
+                    }
+                },
+                error: function(XmlHttpRequest, textStatus, errorThrown){
+                    layer.msg('转入错误',{icon: 5,time:1000});
+                }
+            });
+        });
+    }
+
 </script>
 </body>
 </html>