diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java index 9d702027..fe761dec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysMakeOrderServiceImpl.java @@ -687,6 +687,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService qualityOrderDetail.setQualityStorageStatus("4"); qualityOrderDetail.setQualityOrderType("1"); qualityOrderDetail.setRelatedOrderCode(makeorderBom.getMakeNo()); + qualityOrderDetail.setDeliveryInspectionTime(DateUtils.getNowDate()); qualityOrderDetail.setCreateBy(ShiroUtils.getLoginName()); qualityOrderDetail.setCreateTime(DateUtils.getNowDate()); return orderDetailMapper.insertQualityOrderDetail(qualityOrderDetail); @@ -699,6 +700,7 @@ public class SysMakeOrderServiceImpl implements ISysMakeOrderService qualityOrder.setQualityStatus("0"); qualityOrder.setQualityStorageStatus("4"); qualityOrder.setQualityOrderType("1"); + qualityOrder.setDeliveryInspectionTime(DateUtils.getNowDate()); qualityOrder.setCreateTime(DateUtils.getNowDate()); qualityOrder.setCreateBy(loginName); return qualityOrder; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java index 16e7abcb..df1657c7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/warehouse/mapper/WarehouseStorageOrderMapper.java @@ -21,6 +21,10 @@ public interface WarehouseStorageOrderMapper */ public WarehouseStorageOrder selectWarehouseStorageOrderById(Long warehouseStorageId); + /* + * 根据入库单号查询入库单*/ + public WarehouseStorageOrder selectWarehouseStorageOrderByCode(String warehouseStorageCode); + /** * 查询仓库入库单列表 * diff --git a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml index 2896e5d3..0f709516 100644 --- a/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/warehouse/WarehouseStorageOrderMapper.xml @@ -75,6 +75,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where warehouse_storage_id = #{warehouseStorageId} + + insert into warehouse_storage_order