diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java index 87f5382d..970756d6 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java @@ -476,4 +476,22 @@ public class ZprodordconfStruIn implements java.io.Serializable { _javaType, _xmlType, typeDesc); } + @Override + public String toString() { + return "ZprodordconfStruIn{" + + "aufnr='" + aufnr + '\'' + + ", vornr='" + vornr + '\'' + + ", aueru='" + aueru + '\'' + + ", lmnga=" + lmnga + + ", xmnga=" + xmnga + + ", ism01=" + ism01 + + ", ism02=" + ism02 + + ", ism03=" + ism03 + + ", ism04=" + ism04 + + ", ism05=" + ism05 + + ", ism06=" + ism06 + + ", __equalsCalc=" + __equalsCalc + + ", __hashCodeCalc=" + __hashCodeCalc + + '}'; + } } diff --git a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java index ee84e2b3..18eb1910 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java @@ -512,4 +512,23 @@ public class ZprodordconfStruOut implements java.io.Serializable { _javaType, _xmlType, typeDesc); } + @Override + public String toString() { + return "ZprodordconfStruOut{" + + "aufnr='" + aufnr + '\'' + + ", vornr='" + vornr + '\'' + + ", aueru='" + aueru + '\'' + + ", lmnga=" + lmnga + + ", ism01=" + ism01 + + ", ism02=" + ism02 + + ", ism03=" + ism03 + + ", ism04=" + ism04 + + ", ism05=" + ism05 + + ", ism06=" + ism06 + + ", ret='" + ret + '\'' + + ", msg='" + msg + '\'' + + ", __equalsCalc=" + __equalsCalc + + ", __hashCodeCalc=" + __hashCodeCalc + + '}'; + } } diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml index 416ee000..f31d312b 100644 --- a/console/src/main/resources/application-qas.yml +++ b/console/src/main/resources/application-qas.yml @@ -45,9 +45,9 @@ ftp: quartz: enabled: true -#打印服务器配置 +#打印服务 print: - server: http://10.10.170.32:8022/print/mesnacprint + server: http://172.16.170.163:8022/print/mesnacprint activeMq: sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0 diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java index f75cf356..19403551 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ItemController.java @@ -99,4 +99,12 @@ public class ItemController { return R.ok(itemService.selectById(itemBo)); } + /** + * 根据物料找出图号 + */ + @GetMapping("/findMapByItemBo") + public R findMapByItemBo(String itemBo){ + return R.ok(itemService.findMapByItemBo(itemBo)); + } + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java index 7ee201fa..51d49705 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/controller/ShopOrderController.java @@ -87,6 +87,8 @@ public class ShopOrderController { public R findByShopOrderBo(String shopOrder){ return R.ok(shopOrderService.findByShopOrderBo(shopOrder)); } + + } diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java index 88bb841b..6dc6829c 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/mapper/ItemMapper.java @@ -3,13 +3,12 @@ package com.foreverwin.mesnac.meapi.mapper; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.foreverwin.mesnac.meapi.model.Item; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import java.time.LocalDate; import java.util.List; +import java.util.Map; /** *

@@ -31,4 +30,6 @@ public interface ItemMapper extends BaseMapper { Item selectById(@Param("locale") String locale, @Param("handle") String handle); List selectListByCriteria(@Param("locale") String locale, @Param("ew") Wrapper wrapper); + + Map findMapByItem(@Param("itemBo")String itemBo); } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java index d05e2415..1d0cf80c 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/ItemService.java @@ -7,8 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.foreverwin.mesnac.meapi.model.Item; -import java.time.LocalDate; import java.util.List; +import java.util.Map; /** *

@@ -37,5 +37,7 @@ public interface ItemService extends IService { Item selectCurrent(String site, String item); + Map findMapByItemBo(String itemBo); + } \ No newline at end of file diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java index 85b34e91..74a5214d 100644 --- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java +++ b/meapi/src/main/java/com/foreverwin/mesnac/meapi/service/impl/ItemServiceImpl.java @@ -2,7 +2,6 @@ package com.foreverwin.mesnac.meapi.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -11,7 +10,6 @@ import com.foreverwin.mesnac.meapi.mapper.ItemMapper; import com.foreverwin.mesnac.meapi.model.Item; import com.foreverwin.mesnac.meapi.service.ItemService; import com.foreverwin.mesnac.meapi.util.StringUtils; -import com.foreverwin.modular.core.util.CommonMethods; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.i18n.LocaleContextHolder; import org.springframework.stereotype.Service; @@ -19,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Locale; +import java.util.Map; /** *

@@ -86,4 +85,11 @@ public class ItemServiceImpl extends ServiceImpl implements It public Item selectCurrent(String site, String item) { return itemMapper.selectCurrentRevision(site, item); } + + @Override + public Map findMapByItemBo(String itemBo) { + return itemMapper.findMapByItem(itemBo); + } + + } \ No newline at end of file diff --git a/meapi/src/main/resources/mapper/ItemMapper.xml b/meapi/src/main/resources/mapper/ItemMapper.xml index e8a074aa..a44d2492 100644 --- a/meapi/src/main/resources/mapper/ItemMapper.xml +++ b/meapi/src/main/resources/mapper/ItemMapper.xml @@ -1013,4 +1013,10 @@ + diff --git a/meapi/src/main/resources/mapper/ShopOrderMapper.xml b/meapi/src/main/resources/mapper/ShopOrderMapper.xml index 6939953b..0f9ab9d5 100644 --- a/meapi/src/main/resources/mapper/ShopOrderMapper.xml +++ b/meapi/src/main/resources/mapper/ShopOrderMapper.xml @@ -1009,12 +1009,11 @@ diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java index 8f23e906..148622d8 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java @@ -317,6 +317,7 @@ public class PodTemplateServiceImpl implements PodTemplateService { QueryWrapper queryWrapper=new QueryWrapper<>(); queryWrapper.eq(SfcHoldLog.SFC,sfc); queryWrapper.eq(SfcHoldLog.STEP_ID,stepId); + queryWrapper.eq(SfcHoldLog.TYPE,"CANCEL"); List list = sfcHoldLogService.list(queryWrapper); if (!list.isEmpty()){ BigDecimal holdTime = list.stream().map(SfcHoldLog::getHoldDuration).reduce(BigDecimal.ZERO, BigDecimal::add);