diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java index 4622fa618..c6818f029 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java @@ -49,6 +49,8 @@ public interface WmsTaskClient { String OTHER_OUT_RECORD_DETAIL = API_PREFIX + "/otherOutRecordDetail"; + String SUB_OUT_RECORD = API_PREFIX + "/subOutRecord"; + /** * 物料状态监控同步erp */ @@ -102,4 +104,7 @@ public interface WmsTaskClient { @PostMapping(OTHER_OUT_RECORD_DETAIL) StOtherOutRecordVO otherOutRecordDetail(@RequestParam Long id); + + @PostMapping(SUB_OUT_RECORD) + void subOutRecord(@RequestParam String goodsCode, @RequestParam String piNo, @RequestParam Long userId); } diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java index b124bec3b..5adf4c10e 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java +++ b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/pojo/entity/StOtherOutRecord.java @@ -131,6 +131,7 @@ public class StOtherOutRecord extends TenantEntity { public static final Short OUT_TYPE_RETURN = 6; public static final Short OUT_TYPE_TEAM = 8; public static final Short OUT_TYPE_UNQUALIFIED = 11; + public static final Short OUT_TYPE_PRODUCTION = 12; /** * 报废类型:到期维护报废 diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java index 9dcb503d7..c25a3dc0b 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java @@ -98,4 +98,9 @@ public class WmsTaskClientImpl implements WmsTaskClient{ public StOtherOutRecordVO otherOutRecordDetail(@RequestParam Long id) { return stOtherOutRecordService.getDetail(id); } + + @Override + public void subOutRecord(@RequestParam String goodsCode, @RequestParam String piNo, @RequestParam Long userId) { + stOtherOutRecordService.subOutRecord(goodsCode, piNo, userId); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.java index 562f33e8b..4a1ed3766 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.wms.excel.StOtherOutRecordExcel; import org.springblade.wms.pojo.entity.StOtherOutRecord; +import org.springblade.wms.pojo.entity.StRealtimeStock; import org.springblade.wms.pojo.vo.StOtherOutRecordVO; import java.util.List; @@ -42,5 +43,7 @@ public interface StOtherOutRecordMapper extends BaseMapper { StOtherOutRecord getBySirId(Long sirId); StOtherOutRecordVO getDetail(Long id); + + StRealtimeStock getStock(String goodsCode, String piNo); } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml index a5162ea04..01c084173 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/mapper/StOtherOutRecordMapper.xml @@ -160,6 +160,18 @@ AND soor.is_deleted = 0; + + diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java index 5d981b087..20c0f2eea 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStOtherOutRecordService.java @@ -31,6 +31,8 @@ public interface IStOtherOutRecordService extends BaseService IPage selectStOtherOutRecordPage(IPage page, StOtherOutRecordVO stOtherOutRecord); + void subOutRecord(String goodsCode, String piNo, Long userId); + /** * 导出数据 * diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java index 9379ee409..afdabecdb 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StOtherOutRecordServiceImpl.java @@ -6,6 +6,7 @@ import jakarta.annotation.Resource; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.utils.AuthUtil; import org.springblade.desk.common.enums.MesApprovalRecordBizTypeEnum; import org.springblade.desk.common.feign.IMesApprovalRecordClient; import org.springblade.desk.common.pojo.dto.MesApprovalRecordFeignDTO; @@ -197,6 +198,7 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl outList, BladeUser user) { + BladeUser user1 = AuthUtil.getUser(); int a = 0, b = 0; for (StRealtimeStock stock : outList) { if (stock.getOutQuantity() == null) { @@ -317,8 +319,32 @@ public class StOtherOutRecordServiceImpl extends BaseServiceImpl exportStOtherOutRecord(Wrapper queryWrapper) { List stOtherOutRecordList = baseMapper.exportStOtherOutRecord(queryWrapper); //stOtherOutRecordList.forEach(stOtherOutRecord -> {