From ca05b146c46e16326d60f46be9b154ca13a45302 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Thu, 30 May 2024 16:22:50 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86:=20?= =?UTF-8?q?=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95=20=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E5=85=A5=E5=BA=93=E5=8D=95=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=EF=BC=8C=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=96=B0=E5=A2=9E=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20=E5=85=A5=E5=BA=93-=E7=94=9F=E4=BA=A7=E8=AE=A2?= =?UTF-8?q?=E5=8D=95(=E7=94=9F=E4=BA=A7=E5=85=A5=E5=BA=93)=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2storageMake.html=20=E6=96=B0=E5=A2=9E=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=8C=89=E9=92=AE=20=E5=90=8E=E7=AB=AF=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=85=A5=E5=BA=93=E6=8E=A5=E5=8F=A3=20=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AE=E5=AE=A2=E6=88=B7?= =?UTF-8?q?Id=E6=9F=A5=E8=AF=A2=E7=94=9F=E4=BA=A7=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WarehouseStorageOrderController.java | 36 ++ .../domain/WarehouseStorageOrderDetail.java | 80 ++++ .../WarehouseStorageOrderDetailMapper.java | 13 + .../IWarehouseStorageOrderService.java | 5 + .../WarehouseStorageOrderServiceImpl.java | 36 ++ .../WarehouseStorageOrderDetailMapper.xml | 110 +++++- .../warehouse/storageOrder/storageMake.html | 343 ++++++++++++++++++ .../warehouse/storageOrder/storageOrder.html | 13 +- 8 files changed, 633 insertions(+), 3 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java index 6bd0f80b..8fa17492 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/controller/WarehouseStorageOrderController.java @@ -265,4 +265,40 @@ public class WarehouseStorageOrderController extends BaseController return groupedDetails; } + + /** + * 入库-生产订单(生产入库) + */ + @GetMapping("/storageMake/{warehouseStorageId}") + public String storageMake(@PathVariable("warehouseStorageId") Long warehouseStorageId, ModelMap mmap) + { + WarehouseStorageOrder warehouseStorageOrder = warehouseStorageOrderService.selectWarehouseStorageOrderById(warehouseStorageId); + mmap.put("warehouseStorageOrder", warehouseStorageOrder); + return prefix + "/storageMake"; + } + + /** + * 修改保存入库-生产订单(生产入库) + */ + @RequiresPermissions("warehouse:storageOrder:storagePurchaseWarehouse") + @Log(title = "仓库入库单", businessType = BusinessType.UPDATE) + @PostMapping("/storageMake") + @ResponseBody + public AjaxResult storageMakeSave(@RequestBody WarehouseStorageOrder warehouseStorageOrder) + { + return toAjax(warehouseStorageOrderService.updateStorageMake(warehouseStorageOrder)); + } + + + /** + * 入库-生产订单(生产入库) 客户物料详情列表 + */ + @ResponseBody + @RequestMapping("/storageMakeDetail") + public Map> storageMakeDetail(String warehouseStorageCode){ + List allDetails = storageOrderDetailService.selectStorageOrderDetailListByCode(warehouseStorageCode); + Map> groupedDetails = allDetails.stream().collect(Collectors.groupingBy(WarehouseStorageOrderDetail::getCustomerId)); + return groupedDetails; + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java index 04fd09ed..f491d7cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/domain/WarehouseStorageOrderDetail.java @@ -208,6 +208,31 @@ public class WarehouseStorageOrderDetail extends BaseEntity /** 存放位置 */ @Excel(name = "存放位置") private String storageLocation; + + /** 生产入库数 */ + @Excel(name = "生产入库数") + private Integer makeStorageNum; + + /** 客户ID */ + @Excel(name = "客户ID") + private String customerId; + + /** 客户名称 */ + @Excel(name = "客户名称") + private String customerName; + + /** 客户联系人 */ + @Excel(name = "客户联系人") + private String customerContactPeople; + + /** 客户联系人电话 */ + @Excel(name = "客户联系人电话") + private String customerContactNumber; + + /** 客户公司地址 */ + @Excel(name = "客户公司地址") + private String customerCompanyAddress; + public void setWarehouseStorageDetailId(Long warehouseStorageDetailId) { this.warehouseStorageDetailId = warehouseStorageDetailId; @@ -632,6 +657,55 @@ public class WarehouseStorageOrderDetail extends BaseEntity this.storageLocation = storageLocation; } + + public Integer getMakeStorageNum() { + return makeStorageNum; + } + + public void setMakeStorageNum(Integer makeStorageNum) { + this.makeStorageNum = makeStorageNum; + } + + public String getCustomerId() { + return customerId; + } + + public void setCustomerId(String customerId) { + this.customerId = customerId; + } + + public String getCustomerName() { + return customerName; + } + + public void setCustomerName(String customerName) { + this.customerName = customerName; + } + + public String getCustomerContactPeople() { + return customerContactPeople; + } + + public void setCustomerContactPeople(String customerContactPeople) { + this.customerContactPeople = customerContactPeople; + } + + public String getCustomerContactNumber() { + return customerContactNumber; + } + + public void setCustomerContactNumber(String customerContactNumber) { + this.customerContactNumber = customerContactNumber; + } + + public String getCustomerCompanyAddress() { + return customerCompanyAddress; + } + + public void setCustomerCompanyAddress(String customerCompanyAddress) { + this.customerCompanyAddress = customerCompanyAddress; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -671,6 +745,7 @@ public class WarehouseStorageOrderDetail extends BaseEntity .append("temporaryQualifiedNum", getTemporaryQualifiedNum()) .append("hasStorageNum", getHasStorageNum()) .append("storageNum", getStorageNum()) + .append("makeStorageNum",getMakeStorageNum()) .append("qualityHasQualifiedNum", getQualityHasQualifiedNum()) .append("qualityQualifiedNum", getQualityQualifiedNum()) .append("refundsExchangesNum", getRefundsExchangesNum()) @@ -682,6 +757,11 @@ public class WarehouseStorageOrderDetail extends BaseEntity .append("temporaryRemark", getTemporaryRemark()) .append("temporaryReportUrl", getTemporaryReportUrl()) .append("storageLocation",getStorageLocation()) + .append("customerId", getCustomerId()) + .append("customerName", getCustomerName()) + .append("customerContactPeople", getCustomerContactPeople()) + .append("customerContactNumber", getCustomerContactNumber()) + .append("customerCompanyAddress", getCustomerCompanyAddress()) .append("createTime", getCreateTime()) .append("createBy", getCreateBy()) .append("updateBy", getUpdateBy()) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderDetailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderDetailMapper.java index c58dcd78..6d4f9fe6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderDetailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderDetailMapper.java @@ -91,4 +91,17 @@ public interface WarehouseStorageOrderDetailMapper * 根据入库单号、供应商id、物料号更新对应的物料单详情 * */ int updateWarehouseStorageOrderDetailByObject(WarehouseStorageOrderDetail warehouseStorageOrderDetail); + + + /* + * 根据入库单号、客户ID、物料号查找对应的物料单详情 + * */ + WarehouseStorageOrderDetail selectWarehouseStorageMakeOrderByObject(WarehouseStorageOrderDetail tempStorageOrderDetail); + + + /* + * 根据入库单号、客户id、物料号更新对应的物料单详情 + * */ + int updateWarehouseStorageMakeOrderDetailByObject(WarehouseStorageOrderDetail warehouseStorageOrderDetail); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java index acd54b59..3c8399da 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/IWarehouseStorageOrderService.java @@ -72,4 +72,9 @@ public interface IWarehouseStorageOrderService * @return */ int restoreWarehouseStorageOrderById(Long warehouseStorageId); + + /* + * 入库-生产订单 + * */ + int updateStorageMake(WarehouseStorageOrder warehouseStorageOrder); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java index cf9de9f7..865d6386 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/service/impl/WarehouseStorageOrderServiceImpl.java @@ -106,6 +106,40 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS return warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder); } + + /* + * 入库-生产订单 + * */ + @Override + public int updateStorageMake(WarehouseStorageOrder warehouseStorageOrder) { + String loginName = ShiroUtils.getLoginName(); + warehouseStorageOrder.setUpdateBy(loginName); + warehouseStorageOrder.setUpdateTime(DateUtils.getNowDate()); + + List storageOrderDetailList = warehouseStorageOrder.getWarehouseStorageOrderDetailList(); + + if (StringUtils.isEmpty(storageOrderDetailList)){ + log.warn("入库单详情为空:{}",storageOrderDetailList); + }else { + for (WarehouseStorageOrderDetail warehouseStorageOrderDetail : storageOrderDetailList) { + warehouseStorageOrderDetail.setWarehouseStorageCode(warehouseStorageOrder.getWarehouseStorageCode()); + WarehouseStorageOrderDetail tempStorageOrderDetail = new WarehouseStorageOrderDetail(); + tempStorageOrderDetail.setMaterialNo(warehouseStorageOrderDetail.getMaterialNo()); + tempStorageOrderDetail.setCustomerId(warehouseStorageOrderDetail.getCustomerId()); + tempStorageOrderDetail.setWarehouseStorageCode(warehouseStorageOrder.getWarehouseStorageCode()); + WarehouseStorageOrderDetail storageOrderDetailFromData = storageOrderDetailMapper.selectWarehouseStorageMakeOrderByObject(tempStorageOrderDetail); + if (storageOrderDetailFromData == null){ + log.warn("数据库中入库单详情为空:{}",tempStorageOrderDetail); + }else { + storageOrderDetailMapper.updateWarehouseStorageMakeOrderDetailByObject(warehouseStorageOrderDetail); + } + } + } + + return warehouseStorageOrderMapper.updateWarehouseStorageOrder(warehouseStorageOrder); + + } + /** * 删除仓库入库单对象 * @@ -153,4 +187,6 @@ public class WarehouseStorageOrderServiceImpl implements IWarehouseStorageOrderS { return warehouseStorageOrderMapper.restoreWarehouseStorageOrderById(warehouseStorageId); } + + } diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml index bff5eeb0..4736f8de 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderDetailMapper.xml @@ -41,6 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -52,6 +53,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -59,7 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select warehouse_storage_detail_id, warehouse_storage_code, related_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, warehouse_storage_class, warehouse_order_type, warehouse_dept_type, warehouse_employee, warehouse_code, warehouse_name, warehouse_detail_address, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_dept_type, make_total, notify_has_arrived_num, notify_arrive_num, actual_has_arrived_num, actual_arrive_num, temporary_has_qualified_num, temporary_qualified_num, has_storage_num, storage_num, quality_has_qualified_num, quality_qualified_num, refunds_exchanges_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, temporary_remark, temporary_report_url, storage_location, create_time, create_by, update_by, update_time from warehouse_storage_order_detail + select warehouse_storage_detail_id, warehouse_storage_code, related_order_code, warehouse_storage_status, warehouse_quality_status, warehouse_storage_type, warehouse_storage_class, warehouse_order_type, warehouse_dept_type, warehouse_employee, warehouse_code, warehouse_name, warehouse_detail_address, supplier_code, supplier_name, customer_contact, contact_number, supplier_address, customer_id, customer_name, customer_contact_people, customer_contact_number, customer_company_address, material_no, material_name, material_type, material_photoUrl, material_brand, material_unit, material_describe, material_process_method, material_dept_type, make_total, notify_has_arrived_num, notify_arrive_num, actual_has_arrived_num, actual_arrive_num, temporary_has_qualified_num, temporary_qualified_num, has_storage_num, storage_num, make_storage_num ,quality_has_qualified_num, quality_qualified_num, refunds_exchanges_num, arrived_time, temporary_time, delivery_inspection_time, quality_time, storage_time, temporary_remark, temporary_report_url, storage_location, create_time, create_by, update_by, update_time from warehouse_storage_order_detail + + + + insert into warehouse_storage_order_detail @@ -104,6 +119,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" customer_contact, contact_number, supplier_address, + customer_id, + customer_name, + customer_contact_people, + customer_contact_number, + customer_company_address, material_no, material_name, material_type, @@ -122,6 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" temporary_qualified_num, has_storage_num, storage_num, + make_storage_num, quality_has_qualified_num, quality_qualified_num, refunds_exchanges_num, @@ -156,6 +177,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{customerContact}, #{contactNumber}, #{supplierAddress}, + #{customerId}, + #{customerName}, + #{customerContactPeople}, + #{customerContactNumber}, + #{customerCompanyAddress}, #{materialNo}, #{materialName}, #{materialType}, @@ -174,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{temporaryQualifiedNum}, #{hasStorageNum}, #{storageNum}, + #{makeStorageNum}, #{qualityHasQualifiedNum}, #{qualityQualifiedNum}, #{refundsExchangesNum}, @@ -212,6 +239,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" customer_contact = #{customerContact}, contact_number = #{contactNumber}, supplier_address = #{supplierAddress}, + customer_id = #{customerId}, + customer_name = #{customerName}, + customer_contact_people = #{customerContactPeople}, + customer_contact_number = #{customerContactNumber}, + customer_company_address = #{customerCompanyAddress}, material_no = #{materialNo}, material_name = #{materialName}, material_type = #{materialType}, @@ -230,6 +262,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" temporary_qualified_num = #{temporaryQualifiedNum}, has_storage_num = #{hasStorageNum}, storage_num = #{storageNum}, + make_storage_num = #{makeStorageNum}, quality_has_qualified_num = #{qualityHasQualifiedNum}, quality_qualified_num = #{qualityQualifiedNum}, refunds_exchanges_num = #{refundsExchangesNum}, @@ -270,6 +303,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" customer_contact = #{customerContact}, contact_number = #{contactNumber}, supplier_address = #{supplierAddress}, + customer_id = #{customerId}, + customer_name = #{customerName}, + customer_contact_people = #{customerContactPeople}, + customer_contact_number = #{customerContactNumber}, + customer_company_address = #{customerCompanyAddress}, material_no = #{materialNo}, material_name = #{materialName}, material_type = #{materialType}, @@ -288,6 +326,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" temporary_qualified_num = #{temporaryQualifiedNum}, has_storage_num = #{hasStorageNum}, storage_num = #{storageNum}, + make_storage_num = #{makeStorageNum}, quality_has_qualified_num = #{qualityHasQualifiedNum}, quality_qualified_num = #{qualityQualifiedNum}, refunds_exchanges_num = #{refundsExchangesNum}, @@ -309,6 +348,75 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and material_no = #{materialNo} + + + + update warehouse_storage_order_detail + + warehouse_storage_code = #{warehouseStorageCode}, + related_order_code = #{relatedOrderCode}, + warehouse_storage_status = #{warehouseStorageStatus}, + warehouse_quality_status = #{warehouseQualityStatus}, + warehouse_storage_type = #{warehouseStorageType}, + warehouse_storage_class = #{warehouseStorageClass}, + warehouse_order_type = #{warehouseOrderType}, + warehouse_dept_type = #{warehouseDeptType}, + warehouse_employee = #{warehouseEmployee}, + warehouse_code = #{warehouseCode}, + warehouse_name = #{warehouseName}, + warehouse_detail_address = #{warehouseDetailAddress}, + supplier_code = #{supplierCode}, + supplier_name = #{supplierName}, + customer_contact = #{customerContact}, + contact_number = #{contactNumber}, + supplier_address = #{supplierAddress}, + customer_id = #{customerId}, + customer_name = #{customerName}, + customer_contact_people = #{customerContactPeople}, + customer_contact_number = #{customerContactNumber}, + customer_company_address = #{customerCompanyAddress}, + material_no = #{materialNo}, + material_name = #{materialName}, + material_type = #{materialType}, + material_photoUrl = #{materialPhotourl}, + material_brand = #{materialBrand}, + material_unit = #{materialUnit}, + material_describe = #{materialDescribe}, + material_process_method = #{materialProcessMethod}, + material_dept_type = #{materialDeptType}, + make_total = #{makeTotal}, + notify_has_arrived_num = #{notifyHasArrivedNum}, + notify_arrive_num = #{notifyArriveNum}, + actual_has_arrived_num = #{actualHasArrivedNum}, + actual_arrive_num = #{actualArriveNum}, + temporary_has_qualified_num = #{temporaryHasQualifiedNum}, + temporary_qualified_num = #{temporaryQualifiedNum}, + has_storage_num = #{hasStorageNum}, + storage_num = #{storageNum}, + make_storage_num = #{makeStorageNum}, + quality_has_qualified_num = #{qualityHasQualifiedNum}, + quality_qualified_num = #{qualityQualifiedNum}, + refunds_exchanges_num = #{refundsExchangesNum}, + arrived_time = #{arrivedTime}, + temporary_time = #{temporaryTime}, + delivery_inspection_time = #{deliveryInspectionTime}, + quality_time = #{qualityTime}, + storage_time = #{storageTime}, + temporary_remark = #{temporaryRemark}, + temporary_report_url = #{temporaryReportUrl}, + storage_location = #{storageLocation}, + create_time = #{createTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where warehouse_storage_code = #{warehouseStorageCode} + and customer_id = #{customerId} + and material_no = #{materialNo} + + + + delete from warehouse_storage_order_detail where warehouse_storage_detail_id = #{warehouseStorageDetailId} diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html new file mode 100644 index 00000000..4f83de07 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMake.html @@ -0,0 +1,343 @@ + + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+ +
+
+ +
+
+
+
+
+ + + + + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html index 08d29485..f4b5258f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOrder.html @@ -79,7 +79,7 @@ var temporaryPurchaseFlag = [[${@permission.hasPermi('warehouse:storageOrder:temporaryPurchase')}]]; var storagePurchaseFlag = [[${@permission.hasPermi('warehouse:storageOrder:storagePurchase')}]]; var storagePurchaseWarehouseFlag = [[${@permission.hasPermi('warehouse:storageOrder:storagePurchaseWarehouse')}]]; - + var storageMakeFlag = [[${@permission.hasPermi('warehouse:storageOrder:storageMake')}]]; var warehouseStorageStatusDatas = [[${@dict.getType('warehouse_storage_status')}]]; var warehouseQualityStatusDatas = [[${@dict.getType('warehouse_quality_status')}]]; @@ -241,11 +241,14 @@ if ( row.warehouseDeptType == 0 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ actions.push('入库 '); } - /*入库-采购单(仓库入库)*/ if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 0 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ actions.push('入库 '); } + /*入库-生产订单(生产入库)*/ + if ( row.warehouseDeptType == 1 && row.warehouseOrderType == 1 && (row.warehouseStorageStatus == 2 || row.warehouseStorageStatus == 3) ){ + actions.push('入库 '); + } return actions.join(''); } }] @@ -277,6 +280,12 @@ $.modal.open("入库",url); }; + /*入库-生产订单(生产入库)*/ + function storageMake(warehouseStorageId){ + var url = ctx + 'warehouse/storageOrder/storageMake/' + warehouseStorageId; + $.modal.open("入库",url); + }; + \ No newline at end of file