[fix] 采购管理 品质管理 销售管理

解决采购订单添加不了入库通知单数据问题：给入库通知添加前端权限字符
修改品质管理的校验提示词
新增品质完成后，入库时加上品质已合格数字段
新增：根据生产单号、领料单号、makeorder_bom_id以及物料号查询领料单详情信息后端接口
修改添加领料后端接口方法：查询领料子表由三个条件更改为四个条件
更改销售订单前端插入数据不显示问题
更改销售订单子表审核后多数据问题

ruoyi-admin/src/main/java/com/ruoyi/quality/service/impl/QualityOrderServiceImpl.java

@@ -160,7 +160,7 @@ public class QualityOrderServiceImpl implements IQualityOrderService
             throw new BusinessException("存在本次到货数为空，请检查！");
         }
         if (hasQualityQualifiedNumNull) {
-            throw new BusinessException("存在品质已合格数为空，请检查！");
+            throw new BusinessException("存在品质合格数为空，请检查！");
         }
         if (hasQualityUnqualifiedNumNull) {
             throw new BusinessException("存在品质不合格数为空，请检查！");

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/SysMakeorderPickDetailMapper.java

@@ -86,4 +86,10 @@ public interface SysMakeorderPickDetailMapper
      * */
     public SysMakeorderPickDetail selectSysMakeorderPickDetailByThreeNo(SysMakeorderPickDetail sysMakeorderPickDetail);
 
+
+    /*
+     * 根据生产单号、领料单号、makeorder_bom_id以及物料号查询领料单详情信息
+     * */
+    public SysMakeorderPickDetail selectSysMakeorderPickDetailByFourNo(SysMakeorderPickDetail sysMakeorderPickDetail);
+
 }

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeorderPickDetailServiceImpl.java

@@ -59,7 +59,7 @@ public class SysMakeorderPickDetailServiceImpl implements ISysMakeorderPickDetai
         sysMakeorderPickDetail.setCreateBy(loginName);
         sysMakeorderPickDetail.setCreateTime(DateUtils.getNowDate());
 
-        SysMakeorderPickDetail tempMakeorderPickDetail = sysMakeorderPickDetailMapper.selectSysMakeorderPickDetailByThreeNo(sysMakeorderPickDetail);
+        SysMakeorderPickDetail tempMakeorderPickDetail = sysMakeorderPickDetailMapper.selectSysMakeorderPickDetailByFourNo(sysMakeorderPickDetail);
         if (tempMakeorderPickDetail != null){
 
             if (tempMakeorderPickDetail.getHasPickNum() != null ){

ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java

@@ -236,6 +236,8 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS
             WarehouseStorageOrderDetail storageOrderDetail = new WarehouseStorageOrderDetail();
             storageOrderDetail.setWarehouseStorageCode(qualityOrder.getInStorageCode());
             storageOrderDetail.setQualityQualifiedNum(qualityOrderDetail.getQualityQualifiedNum());
+            //更新品质已合格数
+            storageOrderDetail.setQualityHasQualifiedNum(qualityOrderDetail.getQualityQualifiedNum());
             storageOrderDetail.setMaterialNo(qualityOrderDetail.getMaterialNo());
             storageOrderDetail.setSupplierCode(qualityOrderDetail.getSupplierCode());
 

ruoyi-admin/src/main/resources/mapper/system/SysMakeorderPickDetailMapper.xml

@@ -74,6 +74,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and  a.material_no = #{materialNo}
     </select>
 
+    <select id="selectSysMakeorderPickDetailByFourNo" parameterType="SysMakeorderPickDetail" resultMap="SysMakeorderPickDetailResult">
+        <include refid="selectSysMakeorderPickDetailVo"/>
+        where a.make_no = #{makeNo}
+        and  a.pick_no = #{pickNo}
+        and  a.material_no = #{materialNo}
+        and a.makeorder_bom_id = #{makeorderBomId}
+    </select>
+
+
     <insert id="insertSysMakeorderPickDetail" parameterType="SysMakeorderPickDetail" useGeneratedKeys="true" keyProperty="id">
         insert into sys_makeorder_pick_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/resources/templates/purchase/purchaseOrder/purchaseOrder.html

@@ -137,6 +137,8 @@
     <script th:src="@{/js/activiti.js}"></script>
     <script th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('purchase:purchaseOrder:edit')}]];
+        var addPurchaseOrderStorageFlag = [[${@permission.hasPermi('purchase:purchaseOrder:addPurchaseOrderStorage')}]];
+
         var auditStatusDatas = [[${@dict.getType('auditStatus')}]];
         var useStatusDatas = [[${@dict.getType('useStatus')}]];
         var eceiptStatusDatas = [[${@dict.getType('sys_eceipt_status')}]];
@@ -219,14 +221,15 @@
                             var actions = [];
                             // actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
                             // actions.push('<a class="btn btn-danger btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.purchaseOrderId + '\')"><i class="fa fa-detail"></i>详情</a>')
-                            actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加入库通知检验单\',\'' + prefix+"/addPurchaseOrderStorage/"+row.purchaseOrderCode + '\')">入库通知</a> ');
+
 
                             if(row.auditStatus=="1" && row.useStatus=="1" && !row.cancelInstanceId) {
                                 // 作废
                                 actions.push('<a class="btn btn-danger btn-xs" href="javascript:void(0)" onclick="$.operate.cancel(\'' + row.purchaseOrderId + '\')"><i class="fa fa-remove"></i> 作废</a>');
                                 // 编辑
                                 actions.push('<a class="btn btn-success btn-xs" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.purchaseOrderId + '\')"><i class="fa fa-edit"></i> 编辑</a> ');
-                                // 已作废
+                                // 入库通知
+                                actions.push('<a class="btn btn-success btn-xs ' + addPurchaseOrderStorageFlag + '" href="javascript:void(0)" onclick="$.modal.open(\'添加入库通知检验单\',\'' + prefix+"/addPurchaseOrderStorage/"+row.purchaseOrderCode + '\')">入库通知</a> ');
                             }else{
                                 actions.push('<a class="btn btn-default btn-xs" href="javascript:void(0)" disabled><i class="fa fa-edit"></i> 编辑</a> ');
                             }