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

ruoyi-admin/src/main/java/com/ruoyi/erp/mapper/ErpMaterialReturnInspectionMapper.java

@@ -77,4 +77,9 @@ public interface ErpMaterialReturnInspectionMapper
     public int restoreErpMaterialReturnInspectionById(Long id);
 
     List<ErpMaterialReturnInspectionExcelDto> selectExportList(ErpMaterialReturnInspection erpMaterialReturnInspection);
+
+    /**
+    *  根据物料退检编号查询物料退检单
+    * */
+    ErpMaterialReturnInspection selectErpMaterialReturnInspectionByNo(String returnInspectionNo);
 }

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

@@ -181,7 +181,10 @@ public class QualityReturnInspectionServiceImpl implements IQualityReturnInspect
         String loginName = ShiroUtils.getLoginName();
         erpMaterialReturnInspection.setUpdateBy(loginName);
         erpMaterialReturnInspection.setUpdateTime(DateUtils.getNowDate());
-        if (erpMaterialReturnInspection.getIsClosed().equals("1")){
+
+        ErpMaterialReturnInspection tempReturnInspection = erpMaterialReturnInspectionMapper.selectErpMaterialReturnInspectionByNo(returnInspectionNo);
+
+        if (tempReturnInspection.getIsClosed().equals("1")){
            throw new BusinessException("已经结案，不可以再上传复检");
         }
         int updateFlag = erpMaterialReturnInspectionMapper.updateErpMaterialReturnInspection(erpMaterialReturnInspection);

ruoyi-admin/src/main/resources/mapper/erp/ErpMaterialReturnInspectionMapper.xml

@@ -109,6 +109,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectErpMaterialReturnInspectionByNo" parameterType="String" resultMap="ErpMaterialReturnInspectionResult">
+        <include refid="selectErpMaterialReturnInspectionVo"/>
+         where a.return_inspection_no = #{returnInspectionNo}
+    </select>
+
     <insert id="insertErpMaterialReturnInspection" parameterType="ErpMaterialReturnInspection" useGeneratedKeys="true" keyProperty="id">
         insert into erp_material_return_inspection
         <trim prefix="(" suffix=")" suffixOverrides=",">

ruoyi-admin/src/main/resources/templates/quality/returnInspection/returnInspectionProcessing.html

@@ -221,6 +221,7 @@
                     field: 'urgencyLevel',
                     align: 'center',
                     title: '紧急程度',
+                    width: 100, // 设置列宽为150像素
                     formatter: function (value,row,index){
                         var curIndex = index;
                         var data = [{ index: curIndex, type: value }];
@@ -260,20 +261,24 @@
                     field: 'dutyUnit',
                     align: 'center',
                     title: '责任单位',
-                    formatter: function (value,row,index){
+                    formatter: function (value, row, index) {
                         var curIndex = index;
-                        return '<input class = "form-control" data-id = "dutyUnit_'+curIndex+'" name="inspectionDetails['+curIndex+'].dutyUnit" value="'+value+'">';
+                        // 如果 value 为空，则设置为空字符串
+                        value = value || "";
+                        return '<input class="form-control" data-id="dutyUnit_' + curIndex + '" name="inspectionDetails[' + curIndex + '].dutyUnit" value="' + value + '">';
                     }
                 },
                 {
                     field: 'recheckRemark',
                     align: 'center',
                     title: '复检备注',
-                    formatter: function (value,row,index){
+                    formatter: function (value, row, index) {
                         var curIndex = index;
-                        return '<input class = "form-control" data-id = "recheckRemark_'+curIndex+'" name="inspectionDetails['+curIndex+'].recheckRemark" value="'+value+'">';
+                        // 如果 value 为空，则设置为空字符串
+                        value = value || "";
+                        return '<input class="form-control" data-id="recheckRemark_' + curIndex + '" name="inspectionDetails[' + curIndex + '].recheckRemark" value="' + value + '">';
                     }
-                },
+                }
             ]
         };
         $.table.init(options);

ruoyi-admin/src/main/resources/templates/system/salesShippingInform/salesShippingInform.html

@@ -46,15 +46,6 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-<!--                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="system:salesShippingInform:add">-->
-<!--                    <i class="fa fa-plus"></i> 添加-->
-<!--                </a>-->
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="system:salesShippingInform:edit">
-                    <i class="fa fa-edit"></i> 修改
-                </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:salesShippingInform:remove">
-                    <i class="fa fa-remove"></i> 删除
-                </a>
                 <a class="btn btn-warning" onclick="exportExcel()" shiro:hasPermission="system:salesShippingInform:export">
                     <i class="fa fa-download"></i> 导出
                 </a>