Merge remote-tracking branch 'origin/master'

hw-modules/hw-mes/src/main/java/com/hw/mes/controller/MesProductOrderController.java

@@ -106,6 +106,24 @@ public class MesProductOrderController extends BaseController {
         return toAjax(mesProductOrderService.productOrderLockInventory(mesProductOrder));
     }
 
+    /**
+     * 工单发布
+     */
+    @Log(title = "生产工单", businessType = BusinessType.UPDATE)
+    @PostMapping("/productOrderPublish")
+    public AjaxResult productOrderPublish(@RequestBody MesProductOrder mesProductOrder) {
+        return toAjax(mesProductOrderService.productOrderPublish(mesProductOrder));
+    }
+
+    /**
+     * 工单撤回
+     */
+    @Log(title = "生产工单", businessType = BusinessType.UPDATE)
+    @PostMapping("/productOrderRecall")
+    public AjaxResult productOrderRecall(@RequestBody MesProductOrder mesProductOrder) {
+        return toAjax(mesProductOrderService.productOrderRecall(mesProductOrder));
+    }
+
     /**
      * 获取工单编号
      *

hw-modules/hw-mes/src/main/java/com/hw/mes/service/IMesProductOrderService.java

@@ -73,4 +73,20 @@ public interface IMesProductOrderService
      */
     public int  productOrderLockInventory(MesProductOrder mesProductOrder);
 
+    /**
+     * 工单发布
+     *
+     * @param mesProductOrder 生产工单
+     * @return 结果
+     */
+    public int productOrderPublish(MesProductOrder mesProductOrder);
+
+    /**
+     * 工单撤回
+     *
+     * @param mesProductOrder 生产工单
+     * @return 结果
+     */
+    public int productOrderRecall(MesProductOrder mesProductOrder);
+
 }

hw-modules/hw-mes/src/main/java/com/hw/mes/service/impl/MesProductOrderServiceImpl.java

@@ -56,7 +56,7 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService {
     @Override
     public int insertMesProductOrder(MesProductOrder mesProductOrder) {
         mesProductOrder.setCreateTime(DateUtils.getNowDate());
-        //校验是否超出销售数量
+        //销售订单添加工单：校验是否超出销售数量
         if (mesProductOrder.getSaleOrderFlag().equals("1") && StringUtils.isNotNull(mesProductOrder.getSaleOrderId())) {
             checkSalesQuantity(mesProductOrder);
         }
@@ -131,9 +131,11 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService {
         BigDecimal sumDecimal = new BigDecimal(0);
         if (StringUtils.isNotNull(mesProductOrders)) {
             for (MesProductOrder order : mesProductOrders) {
+                if (!order.getOrderStatus().equals(MesConstants.RECALL)){
                     sumDecimal = sumDecimal.add(order.getPlanAmount());
                 }
             }
+        }
         sumDecimal = sumDecimal.add(mesProductOrder.getPlanAmount());
         if (mesProductOrder.getSaleAmount().compareTo(sumDecimal) < 0) {
             throw new ServiceException("当前工单计划数量为：" + sumDecimal.longValue() + "，超出该订单销售数量！");
@@ -152,8 +154,40 @@ public class MesProductOrderServiceImpl implements IMesProductOrderService {
         if (productOrder.getStockLockFlag().equals("1")) {
             throw new ServiceException("该工单库存已锁定！");
         }
+        if (!mesProductOrder.getOrderStatus().equals(MesConstants.UN_PUBLISH)){
+            throw new ServiceException("该生产工单不是未发布状态！");
+        }
+        // 调用仓库接口锁定库存
         mesProductOrder.setUpdateTime(DateUtils.getNowDate());
         return mesProductOrderMapper.updateMesProductOrder(mesProductOrder);
     }
 
+    /**
+     * 工单发布
+     * @param mesProductOrder 生产工单
+     * @return
+     */
+    @Override
+    public int productOrderPublish(MesProductOrder mesProductOrder) {
+        if (!mesProductOrder.getOrderStatus().equals(MesConstants.UN_PUBLISH)){
+            throw new ServiceException("该生产工单不是未发布状态！");
+        }
+        mesProductOrder.setOrderStatus(MesConstants.PUBLISHED);
+        return mesProductOrderMapper.updateMesProductOrder(mesProductOrder);
+    }
+
+    /**
+     * 工单撤回
+     * @param mesProductOrder 生产工单
+     * @return
+     */
+    @Override
+    public int productOrderRecall(MesProductOrder mesProductOrder) {
+        // 检验生产派工未下达状态的可进行工单撤回
+        mesProductOrder.setOrderStatus(MesConstants.RECALL);
+        // 调用仓库接口取消锁定库存
+        mesProductOrder.setStockLockFlag("0");
+        return mesProductOrderMapper.updateMesProductOrder(mesProductOrder);
+    }
+
 }

hw-modules/hw-mes/src/main/resources/mapper/mes/MesProductOrderMapper.xml

@@ -70,6 +70,7 @@
     <select id="selectMesProductOrderList" parameterType="MesProductOrder" resultMap="MesProductOrderResult">
         <include refid="selectMesProductOrderVo"/>
         <where>
+            order_status not in ('9')
             <if test="orderCode != null  and orderCode != ''">and order_code = #{orderCode}</if>
             <if test="saleOrderId != null ">and sale_order_id = #{saleOrderId}</if>
             <if test="saleorderCode != null  and saleorderCode != ''">and saleorder_code = #{saleorderCode}</if>

hw-ui/src/api/mes/productOrder.js

@@ -52,6 +52,24 @@ export function productOrderLockInventory(data) {
   })
 }
 
+//发布
+export function productOrderPublish(data) {
+  return request({
+    url: '/mes/productOrder/productOrderPublish',
+    method: 'post',
+    data: data
+  })
+}
+
+//撤回
+export function productOrderRecall(data) {
+  return request({
+    url: '/mes/productOrder/productOrderRecall',
+    method: 'post',
+    data: data
+  })
+}
+
 // 删除生产工单
 export function delProductOrder(productOrderId) {
   return request({

hw-ui/src/views/mes/materialBom/addBom.vue

@@ -59,24 +59,24 @@
       <el-table-column label="物料规格" align="center" prop="materialSpec" />
       <el-table-column label="净重" align="center" prop="netWeight" />
       <el-table-column label="毛重" align="center" prop="grossWeight" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">-->
-          <el-button
+<!--          <el-button-->
-            size="mini"
+<!--            size="mini"-->
-            type="text"
+<!--            type="text"-->
-            icon="el-icon-edit"
+<!--            icon="el-icon-edit"-->
-            @click="handleUpdate(scope.row)"
+<!--            @click="handleUpdate(scope.row)"-->
-            v-hasPermi="['mes:materialinfo:edit']"
+<!--            v-hasPermi="['mes:materialinfo:edit']"-->
-          >修改</el-button>
+<!--          >修改</el-button>-->
-          <el-button
+<!--          <el-button-->
-            size="mini"
+<!--            size="mini"-->
-            type="text"
+<!--            type="text"-->
-            icon="el-icon-delete"
+<!--            icon="el-icon-delete"-->
-            @click="handleDelete(scope.row)"
+<!--            @click="handleDelete(scope.row)"-->
-            v-hasPermi="['mes:materialinfo:remove']"
+<!--            v-hasPermi="['mes:materialinfo:remove']"-->
-          >删除</el-button>
+<!--          >删除</el-button>-->
-        </template>
+<!--        </template>-->
-      </el-table-column>
+<!--      </el-table-column>-->
     </el-table>
 
     <pagination

hw-ui/src/views/mes/productOrder/index.vue

@@ -70,7 +70,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['mes:productOrder:add']"
-        >销售订单新增</el-button>
+        >销售订单新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -80,7 +81,8 @@
           size="mini"
           @click="handleNoOrderAdd"
           v-hasPermi="['mes:productOrder:add']"
-        >无订单新增</el-button>
+        >无订单新增
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -91,7 +93,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['mes:productOrder:edit']"
-        >修改</el-button>
+        >修改
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -102,7 +105,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['mes:productOrder:remove']"
-        >删除</el-button>
+        >删除
+        </el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -112,7 +116,8 @@
           size="mini"
           @click="handleExport"
           v-hasPermi="['mes:productOrder:export']"
-        >导出</el-button>
+        >导出
+        </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
@@ -190,21 +195,43 @@
           <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">
         <template slot-scope="scope">
+          <!--          <el-button-->
+          <!--            size="mini"-->
+          <!--            type="text"-->
+          <!--            icon="el-icon-edit"-->
+          <!--            @click="handleUpdate(scope.row)"-->
+          <!--            v-hasPermi="['mes:productOrder:edit']"-->
+          <!--          >修改</el-button>-->
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-lock"
-            @click="handleUpdate(scope.row)"
+            @click="handleLockInventory(scope.row)"
-            v-hasPermi="['mes:productOrder:edit']"
+          >锁库存
-          >修改</el-button>
+          </el-button>
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-success"
-            @click="handleLockInventory(scope.row)"
+            @click="handlePublish(scope.row)"
-          >锁库存</el-button>
+          >发布
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-d-arrow-left"
+            @click="handleRecall(scope.row)"
+          >撤回
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-right"
+            @click="handleDispatch(scope.row)"
+          >生产派工
+          </el-button>
           <!--          <el-button-->
           <!--            size="mini"-->
           <!--            type="text"-->
@@ -260,15 +287,6 @@
             ></el-option>
           </el-select>
         </el-form-item>
-<!--        <el-form-item label="派工类型" prop="dispatchType">-->
-<!--          <el-radio-group v-model="form.dispatchType">-->
-<!--            <el-radio-->
-<!--              v-for="dict in dict.type.dispatch_type"-->
-<!--              :key="dict.value"-->
-<!--              :label="dict.value"-->
-<!--            >{{dict.label}}</el-radio>-->
-<!--          </el-radio-group>-->
-<!--        </el-form-item>-->
         <el-form-item label="工艺路线" prop="dispatchId">
           <el-select v-model="form.dispatchId" filterable placeholder="请选择工艺路线" clearable>
             <el-option
@@ -285,12 +303,6 @@
         <el-form-item label="计划数量" prop="planAmount">
           <el-input-number v-model="form.planAmount" placeholder="请输入计划数量"/>
         </el-form-item>
-<!--        <el-form-item label="已派工数量" prop="dispatchAmount">-->
-<!--          <el-input-number v-model="form.dispatchAmount" placeholder="请输入已派工数量" />-->
-<!--        </el-form-item>-->
-<!--        <el-form-item label="完成数量" prop="completeAmount">-->
-<!--          <el-input-number v-model="form.completeAmount" placeholder="请输入完成数量" />-->
-<!--        </el-form-item>-->
         <el-form-item label="计划交货日期" prop="planDeliveryDate">
           <el-date-picker clearable
                           v-model="form.planDeliveryDate"
@@ -315,25 +327,80 @@
                           placeholder="请选择计划结束时间">
           </el-date-picker>
         </el-form-item>
-<!--        <el-form-item label="工单状态" prop="orderStatus">-->
+        <el-form-item label="备注" prop="remark">
-<!--          <el-select v-model="form.orderStatus" placeholder="请选择工单状态">-->
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
-<!--            <el-option-->
+        </el-form-item>
-<!--              v-for="dict in dict.type.plan_status"-->
+      </el-form>
-<!--              :key="dict.value"-->
+      <div slot="footer" class="dialog-footer">
-<!--              :label="dict.label"-->
+        <el-button type="primary" @click="submitForm">确 定</el-button>
-<!--              :value="dict.value"-->
+        <el-button @click="cancel">取 消</el-button>
-<!--            ></el-option>-->
+      </div>
-<!--          </el-select>-->
+    </el-dialog>
-<!--        </el-form-item>-->
+
-<!--        <el-form-item label="库存锁定标识" prop="stockLockFlag">-->
+    <!-- 无销售订单添加生产工单对话框 -->
-<!--          <el-radio-group v-model="form.stockLockFlag">-->
+    <el-dialog :title="title" :visible.sync="noOrderOpen" width="500px" append-to-body>
-<!--            <el-radio-->
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
-<!--              v-for="dict in dict.type.active_flag"-->
+        <el-form-item label="工单编号" prop="orderCode">
-<!--              :key="dict.value"-->
+          <el-input v-model="form.orderCode" :disabled="true"/>
-<!--              :label="dict.value"-->
+        </el-form-item>
-<!--            >{{dict.label}}</el-radio>-->
+<!--        <el-form-item label="项目编号" prop="projectNo">-->
-<!--          </el-radio-group>-->
+<!--          <el-input v-model="form.projectNo" placeholder="请输入项目编号"/>-->
 <!--        </el-form-item>-->
+        <el-form-item label="物料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请点击右侧检索物料" readonly>
+            <el-button slot="append" icon="el-icon-search"  @click="handleMaterialAdd"></el-button>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="物料BOM" prop="materialBomId">
+          <el-select v-model="form.materialBomId" placeholder="请选择物料BOM">
+            <el-option
+              v-for="item in materialBomList"
+              :key="item.materialBomId"
+              :label="item.materialNameDesc"
+              :value="item.materialBomId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工艺路线" prop="dispatchId">
+          <el-select v-model="form.dispatchId" filterable placeholder="请选择工艺路线" clearable>
+            <el-option
+              v-for="item in routeList"
+              :key="item.routeId"
+              :label="item.routeName"
+              :value="item.routeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="销售数量" prop="saleAmount">
+          <el-input-number v-model="form.saleAmount" placeholder="请输入销售数量"/>
+        </el-form-item>
+        <el-form-item label="计划数量" prop="planAmount">
+          <el-input-number v-model="form.planAmount" placeholder="请输入计划数量"/>
+        </el-form-item>
+        <el-form-item label="计划交货日期" prop="planDeliveryDate">
+          <el-date-picker clearable
+                          v-model="form.planDeliveryDate"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择计划交货日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划开始时间" prop="planBeginTime">
+          <el-date-picker clearable
+                          v-model="form.planBeginTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择计划开始时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="计划结束时间" prop="planEndTime">
+          <el-date-picker clearable
+                          v-model="form.planEndTime"
+                          type="datetime"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          placeholder="请选择计划结束时间">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"/>
         </el-form-item>
@@ -353,6 +420,15 @@
       </div>
     </el-dialog>
 
+    <!-- 添加物料信息对话框 -->
+    <el-dialog title="选择物料信息" :visible.sync="materialOpen"  append-to-body>
+      <add-bom @selection="handleSelection" ref="materialRef"></add-bom>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitMaterialForm">确 定</el-button>
+        <el-button @click="materialOpen = false">取 消</el-button>
+      </div>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -363,16 +439,19 @@ import {
   delProductOrder,
   addProductOrder,
   updateProductOrder,
-  getOrderCode, productOrderLockInventory
+  getOrderCode, productOrderLockInventory, productOrderPublish, productOrderRecall
 } from "@/api/mes/productOrder";
 import addSaleOrder from '@//views/mes/productOrder/addSaleOrder.vue';
 import {getMaterialVisionList} from "@//api/mes/materialBom";
 import {findRouteList} from "@//api/mes/baseRoute";
+import addBom from '@//views/mes/materialBom/addBom.vue';
+
 export default {
   name: "ProductOrder",
   dicts: ['active_flag', 'plan_status', 'dispatch_type'],
   components: {
-    'add-SaleOrder': addSaleOrder
+    'add-SaleOrder': addSaleOrder,
+    'add-bom': addBom
   },
   data() {
     return {
@@ -398,6 +477,8 @@ export default {
       saleOrderOpen: false,
       // 是否显示无订单添加弹出层
       noOrderOpen: false,
+      // 是否显示物料弹出层
+      materialOpen: false,
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -453,10 +534,17 @@ export default {
         dispatchId: [
           {required: true, message: "派工ID不能为空", trigger: "blur"}
         ],
+        saleAmount: [
+          {required: true, message: "销售数量不能为空", trigger: "blur"},
+          {
+            validator: (rule, value, callback) => callback(Number.isInteger(Number(value)) && Number(value) >= 1 ? undefined : new Error("销售数量需要是大于等于1的整数")),
+            trigger: "blur"
+          }
+        ],
         planAmount: [
           {required: true, message: "计划数量不能为空", trigger: "blur"},
           {
-            validator: (rule, value, callback) => callback(Number(value) >= 1 ? undefined : new Error("计划数量需要大于等于1")),
+            validator: (rule, value, callback) => callback(Number.isInteger(Number(value)) && Number(value) >= 1 ? undefined : new Error("计划数量需要是大于等于1的整数")),
             trigger: "blur"
           }
         ],
@@ -515,6 +603,7 @@ export default {
     // 取消按钮
     cancel() {
       this.open = false;
+      this.noOrderOpen = false;
       this.reset();
     },
     // 表单重置
@@ -578,6 +667,22 @@ export default {
     },
 
     /** 提交物料信息按钮 */
+    submitMaterialForm() {
+      let selectedRow = this.$refs.materialRef.selectedRow;
+      this.form.materialId = selectedRow.materialId;
+      this.form.materialName = selectedRow.materialName;
+      getMaterialVisionList(this.form.materialId).then(response => {
+        this.materialBomList = response.data
+        if (this.materialBomList.length !== 0){
+          this.form.materialBomId = this.materialBomList[0].materialBomId
+        } else {
+          this.form.materialBomId = null;
+        }
+      })
+      this.materialOpen = false;
+    },
+
+    /** 提交销售订单信息按钮 */
     submitSaleOrderForm() {
       let selectedRow = this.$refs.saleOrderRef.selectedRow;
       this.form.saleOrderId = selectedRow.saleOrderId;
@@ -593,7 +698,11 @@ export default {
       this.form.saleOrderFlag = '1';
       getMaterialVisionList(this.form.materialId).then(response => {
         this.materialBomList = response.data
+        if (this.materialBomList.length !== 0){
           this.form.materialBomId = this.materialBomList[0].materialBomId
+        } else {
+          this.form.materialBomId = null;
+        }
       })
       this.saleOrderOpen = false;
     },
@@ -607,10 +716,20 @@ export default {
       this.open = true;
       this.title = "添加生产工单";
     },
+
+    /** 新增按钮操作 */
+    handleMaterialAdd() {
+      this.materialOpen = true;
+    },
+
     /** 无订单新增按钮操作 */
     handleNoOrderAdd() {
       this.reset();
+      getOrderCode().then(response => {
+        this.form.orderCode = response.msg;
+      })
       this.noOrderOpen = true;
+      this.form.saleOrderFlag = '0';
       this.title = "添加生产工单";
     },
     /** 修改按钮操作 */
@@ -623,6 +742,7 @@ export default {
         this.title = "修改生产工单";
       });
     },
+
     /** 锁库存 */
     handleLockInventory(row) {
       this.form.productOrderId = row.productOrderId;
@@ -632,6 +752,31 @@ export default {
         this.getList();
       });
     },
+
+    /** 发布 */
+    handlePublish(row) {
+      this.form.productOrderId = row.productOrderId;
+      this.form.orderStatus = row.orderStatus;
+      productOrderPublish(this.form).then(response => {
+        this.$modal.msgSuccess("发布成功");
+        this.getList();
+      });
+    },
+
+    /** 撤回 */
+    handleRecall(row) {
+      this.form.productOrderId = row.productOrderId;
+      productOrderRecall(this.form).then(response => {
+        this.$modal.msgSuccess("撤回成功");
+        this.getList();
+      });
+    },
+
+    /** 生产派工 */
+    handleDispatch(row) {
+      this.form.productOrderId = row.productOrderId;
+    },
+
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
@@ -640,12 +785,14 @@ export default {
             updateProductOrder(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
+              this.noOrderOpen = false;
               this.getList();
             });
           } else {
             addProductOrder(this.form).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
+              this.noOrderOpen = false;
               this.getList();
             });
           }
@@ -660,7 +807,8 @@ export default {
       }).then(() => {
         this.getList();
         this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      }).catch(() => {
+      });
     },
     /** 导出按钮操作 */
     handleExport() {