[fix]生产管理

生产订单
修改领料按钮的条件判断为:(row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') && (row.eceiptStatus == '7' || row.eceiptStatus == '8')

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

@@ -245,7 +245,8 @@
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'工程审核\',\'' + prefix+"/gcsh/"+row.id + '\')">工程审核</a> ');
                         }
                         // 领料
-                        if(row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5'){
+                        if((row.makeStatus == '3' || row.makeStatus == '4' || row.makeStatus == '5') &&
+                            (row.eceiptStatus == '7' || row.eceiptStatus == '8')){
                             actions.push('<a class="btn btn-success btn-xs " href="javascript:void(0)" onclick="$.modal.open(\'添加领料单\',\'' + prefix+"/addpick/"+row.id + '\')">领料</a> ');
                         }
                         // 委内入库