diff --git a/nladmin-system/nlsso-server/pom.xml b/nladmin-system/nlsso-server/pom.xml index 6006c7b..fc900b8 100644 --- a/nladmin-system/nlsso-server/pom.xml +++ b/nladmin-system/nlsso-server/pom.xml @@ -288,7 +288,7 @@ com.yomahub - tlog-core + tlog-all-spring-boot-starter 1.5.0 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java index d00bca7..030054a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosInServiceImpl.java @@ -164,7 +164,6 @@ public class PdaIosInServiceImpl implements PdaIosInService { if (count > 0) { throw new BadRequestException("载具编码：" + vehicle_code + "已存在库内，请对数据进行核实！"); } - //todo token未正确处理 GroupPlate groupDao = GroupPlate.builder() .group_id(IdUtil.getStringId()) .material_id(materDao.getMaterial_code()) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java index 0d5ed1a..1b7fd97 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda_manage/ios_manage/service/impl/PdaIosOutServiceImpl.java @@ -145,15 +145,21 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { GroupPlate plateDao = mdPbGroupplateMapper.selectOne( new LambdaQueryWrapper() .eq(GroupPlate::getGroup_id, obj.getString("group_id"))); - Structattr sectDao = iStructattrService.getOne(new LambdaQueryWrapper() + + Structattr struct = iStructattrService.getOne(new LambdaQueryWrapper() .eq(Structattr::getStruct_code, obj.getString("struct_code"))); MdMeMaterialbase materDao = iMdMeMaterialbaseService.getById(plateDao.getMaterial_id()); obj.put("material_id", materDao.getMaterial_id()); obj.put("material_code", materDao.getMaterial_code()); - obj.put("store_id", sectDao.getStor_id()); - obj.put("store_code", sectDao.getStor_code()); - obj.put("store_name", sectDao.getStor_name()); - obj.put("sec", sectDao.getSect_id()); + obj.put("store_id", struct.getStor_id()); + obj.put("store_code", struct.getStor_code()); + obj.put("store_name", struct.getStor_name()); + obj.put("sect_id", struct.getSect_id()); + obj.put("sect_code", struct.getSect_code()); + obj.put("sect_name", struct.getSect_name()); + obj.put("struct_id", struct.getStruct_id()); + obj.put("struct_code", struct.getStruct_code()); + obj.put("struct_name", struct.getStruct_name()); obj.put("qty", plateDao.getQty()); obj.put("unit_id", plateDao.getQty_unit_id()); obj.put("unit_name", plateDao.getQty_unit_name()); @@ -201,12 +207,13 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { io_mst.put("iostorinv_id", iostorinv_id); io_mst.put("bill_code", bill_code); io_mst.put("io_type", IOSEnum.IO_TYPE.code("出库")); - io_mst.put("bill_type", StatusEnum.IOBILL_TYPE_OUT.code("生产出库")); + io_mst.put("bill_type", StatusEnum.IOBILL_TYPE_OUT.code("用料出库")); io_mst.put("biz_date", now.substring(0, 10)); io_mst.put("stor_id", whereJson.get("store_id")); io_mst.put("stor_code", whereJson.get("store_code")); io_mst.put("stor_name", whereJson.get("store_name")); io_mst.put("detail_count", 1); + io_mst.put("total_qty",whereJson.get("qty")); io_mst.put("bill_status", IOSEnum.BILL_STATUS.code("分配完")); io_mst.put("create_mode", IOSEnum.CREATE_MODE.code("PC产生")); io_mst.put("input_optid", currentUserId + ""); @@ -243,6 +250,12 @@ public class PdaIosOutServiceImpl implements PdaIosOutService { dis.put("iostorinv_id", iostorinv_id); dis.put("iostorinvdtl_id", ioStorInvDtl.getString("iostorinvdtl_id")); dis.put("seq_no", 1); + dis.put("sect_id", whereJson.get("sect_id")); + dis.put("sect_code", whereJson.get("sect_code")); + dis.put("sect_name", whereJson.get("sect_name")); + dis.put("struct_id", whereJson.get("struct_id")); + dis.put("struct_code", whereJson.get("struct_code")); + dis.put("struct_name", whereJson.get("struct_name")); dis.put("material_id", whereJson.get("material_id")); dis.put("material_code", whereJson.get("material_code")); dis.put("storagevehicle_code", whereJson.get("storagevehicle_code")); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/StatusEnum.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/StatusEnum.java index 221a6ce..b254e85 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/StatusEnum.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/enums/StatusEnum.java @@ -27,12 +27,9 @@ public enum StatusEnum { /** * 出入库单据类型退货出库 */ - IOBILL_TYPE_IN(ForkMap.of("生产入库", "10", "inStorageTask", "调拨入库", "11", "inStorageTask", "退货入库", "12", "inStorageTask", "拣选回库", - "13", "inStorageTask", "盘点入库", "14", "inStorageTask", "托盘入库", "30", "inStorageTask", "二楼CTU入库", "80", "inStorageTask")), - IOBILL_TYPE_OUT(ForkMap.of("销售出库", "20", "outStorageTask", "生产出库", "21", "outStorageTask", "调拨出库", "22", "outStorageTask", - "拣选出库", "23", "conveyorOutStorageTask", "盘点出库", "24", "outStorageTask", "出库拣选", "25", "toPickPlatformTask", - "退货出库", "26", "outStorageTask", "托盘出库", "40", "outStorageTask", "二楼CTU出库", "81", "inStorageTask", "二楼出库AGV搬运", - "82", "inStorageTask", "二楼空架AGV搬运", "83", "inStorageTask")), + IOBILL_TYPE_IN(ForkMap.of("生产入库", "0001", "StInTask", "手工入库", "0009", "StInTask")), + + IOBILL_TYPE_OUT(ForkMap.of("用料出库", "1001", "StOutTask", "手工出库", "1009", "StOutTask")), IOBILL_TYPE_MOVE(ForkMap.of("移库", "50", "moveStorageTask", "异常位移库", "51", "moveStorageTask")), diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java index 54afc61..e4dcb0b 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/system_manage/service/quartz/utils/ExecutionJob.java @@ -16,9 +16,7 @@ import org.quartz.JobExecutionException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.quartz.QuartzJobBean; - -import javax.annotation.Resource; +import com.yomahub.tlog.task.quartz.TLogQuartzJobBean; import java.util.concurrent.Future; import java.util.concurrent.ThreadPoolExecutor; @@ -31,7 +29,7 @@ import java.util.concurrent.ThreadPoolExecutor; @SuppressWarnings({"unchecked", "all"}) @Slf4j @DisallowConcurrentExecution -public class ExecutionJob extends QuartzJobBean { +public class ExecutionJob extends TLogQuartzJobBean { /** * 该处仅供参考 @@ -41,7 +39,7 @@ public class ExecutionJob extends QuartzJobBean { private ThreadPoolExecutor EXECUTOR; @Override - protected void executeInternal(JobExecutionContext context) throws JobExecutionException { + public void executeTask(JobExecutionContext context) throws JobExecutionException { SysQuartzJob quartzJob = (SysQuartzJob) context.getMergedJobDataMap().get(SysQuartzJob.JOB_KEY); // 获取spring bean ISysQuartzJobService quartzJobService = SpringContextHolder.getBean(SysQuartzJobServiceImpl.class); diff --git a/nladmin-system/nlsso-server/src/main/resources/config/application.yml b/nladmin-system/nlsso-server/src/main/resources/config/application.yml index 1d52e5e..80bdf2b 100644 --- a/nladmin-system/nlsso-server/src/main/resources/config/application.yml +++ b/nladmin-system/nlsso-server/src/main/resources/config/application.yml @@ -18,6 +18,15 @@ spring: redis: repositories: enabled: false + quartz: + properties: + org: + quartz: + jobStore: + threadPool: + threadCount: 14 + # class: org.nl.system.service.quartz.SimpleThreadPool + scheduler-name: scheduler task: pool: # 核心线程池大小