Browse Source

增加实物。

master
刘忱 2 years ago
parent
commit
125cd7c8d9
  1. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java
  2. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java
  3. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java
  4. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java
  5. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java
  6. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java
  7. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java
  8. 3
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java
  9. 4
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countJob/CountJobMainServiceImpl.java

@ -121,6 +121,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
} }
@Override @Override
@Transactional
public Integer acceptCountJobMain(Long id) { public Integer acceptCountJobMain(Long id) {
CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id); CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id);
JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus()); JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus());
@ -138,6 +139,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
} }
@Override @Override
@Transactional
public Integer abandonCountJobMain(Long id) { public Integer abandonCountJobMain(Long id) {
CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id); CountJobMainDO countJobMainDO = this.validateCountJobMainExists(id);
JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus()); JobStatusState jobStatusState = new JobStatusState(countJobMainDO.getStatus());
@ -166,6 +168,7 @@ public class CountJobMainServiceImpl implements CountJobMainService {
} }
@Override @Override
@Transactional
public String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO) { public String executeCountJobMain(CountJobMainUpdateReqVO countJobMainUpdateReqVO) {
//查询数据 //查询数据
CountJobMainDO countJobMainDO = this.validateCountJobMainExists(countJobMainUpdateReqVO.getId()); CountJobMainDO countJobMainDO = this.validateCountJobMainExists(countJobMainUpdateReqVO.getId());

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countPlan/CountPlanMainServiceImpl.java

@ -83,6 +83,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
private SchedulerManager schedulerManager; private SchedulerManager schedulerManager;
@Override @Override
@Transactional
public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) { public Long createCountPlanMain(CountPlanMainCreateReqVO createReqVO) {
if(!createReqVO.getType().equals("MANUAL")) { if(!createReqVO.getType().equals("MANUAL")) {
if (!CronUtils.isValid(createReqVO.getCrontab())) { if (!CronUtils.isValid(createReqVO.getCrontab())) {
@ -105,6 +106,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
} }
@Override @Override
@Transactional
public int updateCountPlanMain(CountPlanMainUpdateReqVO updateReqVO) { public int updateCountPlanMain(CountPlanMainUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validateCountPlanMainExists(updateReqVO.getId()); validateCountPlanMainExists(updateReqVO.getId());
@ -115,6 +117,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
} }
@Override @Override
@Transactional
public int deleteCountPlanMain(Long id) { public int deleteCountPlanMain(Long id) {
// 校验存在 // 校验存在
validateCountPlanMainExists(id); validateCountPlanMainExists(id);
@ -306,6 +309,7 @@ public class CountPlanMainServiceImpl implements CountPlanMainService {
* @param mainDO 盘点申请主 * @param mainDO 盘点申请主
*/ */
@Override @Override
@Transactional
public void generateRequest(CountPlanMainDO mainDO) { public void generateRequest(CountPlanMainDO mainDO) {
List<CountPlanDetailDO> detailDOList = countPlanDetailMapper.selectList(mainDO.getId()); List<CountPlanDetailDO> detailDOList = countPlanDetailMapper.selectList(mainDO.getId());
List<BalanceDO> balanceDOList = this.getBalanceDOList(detailDOList); List<BalanceDO> balanceDOList = this.getBalanceDOList(detailDOList);

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestDetailServiceImpl.java

@ -11,6 +11,7 @@ import com.win.module.wms.convert.countRequest.CountRequestDetailConvert;
import com.win.module.wms.dal.dataobject.countRequest.CountRequestDetailDO; import com.win.module.wms.dal.dataobject.countRequest.CountRequestDetailDO;
import com.win.module.wms.dal.mysql.countRequest.CountRequestDetailMapper; import com.win.module.wms.dal.mysql.countRequest.CountRequestDetailMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -35,6 +36,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService
private TrendsApi trendsApi; private TrendsApi trendsApi;
@Override @Override
@Transactional
public Long createCountRequestDetail(CountRequestDetailCreateReqVO createReqVO) { public Long createCountRequestDetail(CountRequestDetailCreateReqVO createReqVO) {
// 插入 // 插入
CountRequestDetailDO countRequestDetailDO = CountRequestDetailConvert.INSTANCE.convert(createReqVO); CountRequestDetailDO countRequestDetailDO = CountRequestDetailConvert.INSTANCE.convert(createReqVO);
@ -45,6 +47,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService
} }
@Override @Override
@Transactional
public int updateCountRequestDetail(CountRequestDetailUpdateReqVO updateReqVO) { public int updateCountRequestDetail(CountRequestDetailUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validateCountRequestDetailExists(updateReqVO.getId()); validateCountRequestDetailExists(updateReqVO.getId());
@ -55,6 +58,7 @@ public class CountRequestDetailServiceImpl implements CountRequestDetailService
} }
@Override @Override
@Transactional
public int deleteCountRequestDetail(Long id) { public int deleteCountRequestDetail(Long id) {
// 校验存在 // 校验存在
CountRequestDetailDO countRequestDetailDO = validateCountRequestDetailExists(id); CountRequestDetailDO countRequestDetailDO = validateCountRequestDetailExists(id);

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@ -344,6 +344,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
} }
@Override @Override
@Transactional
public Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO) { public Integer createReCountJob(CountRequestMainUpdateReqVO updateReqVO) {
CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO); CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
mainDO.setStage("RECOUNT");//重盘 mainDO.setStage("RECOUNT");//重盘
@ -361,6 +362,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
} }
@Override @Override
@Transactional
public Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO) { public Integer createSuperviseCountJob(CountRequestMainUpdateReqVO updateReqVO) {
CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO); CountRequestMainDO mainDO = CountRequestMainConvert.INSTANCE.convert(updateReqVO);
mainDO.setStage("AUDIT_COUNT");//监盘 mainDO.setStage("AUDIT_COUNT");//监盘

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestDetailServiceImpl.java

@ -22,6 +22,7 @@ import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.location.LocationService; import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.util.JobUtils; import com.win.module.wms.util.JobUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -56,6 +57,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
private TrendsApi trendsApi; private TrendsApi trendsApi;
@Override @Override
@Transactional
public Long createInspectRequestDetail(InspectRequestDetailCreateReqVO createReqVO) { public Long createInspectRequestDetail(InspectRequestDetailCreateReqVO createReqVO) {
// 插入 // 插入
InspectRequestDetailDO inspectRequestDetail = InspectRequestDetailConvert.INSTANCE.convert(createReqVO); InspectRequestDetailDO inspectRequestDetail = InspectRequestDetailConvert.INSTANCE.convert(createReqVO);
@ -69,6 +71,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
} }
@Override @Override
@Transactional
public int updateInspectRequestDetail(InspectRequestDetailUpdateReqVO updateReqVO) { public int updateInspectRequestDetail(InspectRequestDetailUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validateInspectRequestDetailExists(updateReqVO.getId()); validateInspectRequestDetailExists(updateReqVO.getId());
@ -79,6 +82,7 @@ public class InspectRequestDetailServiceImpl implements InspectRequestDetailServ
} }
@Override @Override
@Transactional
public int deleteInspectRequestDetail(Long id) { public int deleteInspectRequestDetail(Long id) {
// 校验存在 // 校验存在
InspectRequestDetailDO inspectRequestDetailDO = validateInspectRequestDetailExists(id); InspectRequestDetailDO inspectRequestDetailDO = validateInspectRequestDetailExists(id);

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnJob/PurchasereturnJobMainServiceImpl.java

@ -117,7 +117,7 @@ public class PurchasereturnJobMainServiceImpl implements PurchasereturnJobMainSe
* @param ppoLine 订单行 * @param ppoLine 订单行
* @return 供应商发货记录子 * @return 供应商发货记录子
*/ */
public SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pnumber, String pitemCode, String ppoNumber, String ppoLine) { private SupplierdeliverRecordDetailDO selectSupplierdeliverRecordDetailDoExist(String psupplierCode, String pnumber, String pitemCode, String ppoNumber, String ppoLine) {
SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode, pnumber, pitemCode, ppoNumber, ppoLine); SupplierdeliverRecordDetailDO supplierdeliverRecordDetailDO = supplierdeliverRecordMainService.selectSupplierdeliverRecordMainDO(psupplierCode, pnumber, pitemCode, ppoNumber, ppoLine);
if (supplierdeliverRecordDetailDO != null) { if (supplierdeliverRecordDetailDO != null) {
return supplierdeliverRecordDetailDO; return supplierdeliverRecordDetailDO;

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestDetailServiceImpl.java

@ -16,6 +16,7 @@ import com.win.module.wms.service.itembasic.ItembasicService;
import com.win.module.wms.service.itempackaging.ItempackagingService; import com.win.module.wms.service.itempackaging.ItempackagingService;
import com.win.module.wms.util.JobUtils; import com.win.module.wms.util.JobUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -46,6 +47,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
private ItempackagingService itempackagingService; private ItempackagingService itempackagingService;
@Override @Override
@Transactional
public Long createPurchasereturnRequestDetail(PurchasereturnRequestDetailCreateReqVO createReqVO) { public Long createPurchasereturnRequestDetail(PurchasereturnRequestDetailCreateReqVO createReqVO) {
// 插入 // 插入
PurchasereturnRequestDetailDO purchasereturnRequestDetailDO = PurchasereturnRequestDetailConvert.INSTANCE.convert(createReqVO); PurchasereturnRequestDetailDO purchasereturnRequestDetailDO = PurchasereturnRequestDetailConvert.INSTANCE.convert(createReqVO);
@ -57,6 +59,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
} }
@Override @Override
@Transactional
public void updatePurchasereturnRequestDetail(PurchasereturnRequestDetailUpdateReqVO updateReqVO) { public void updatePurchasereturnRequestDetail(PurchasereturnRequestDetailUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validatePurchasereturnRequestDetailExists(updateReqVO.getId()); validatePurchasereturnRequestDetailExists(updateReqVO.getId());
@ -66,6 +69,7 @@ public class PurchasereturnRequestDetailServiceImpl implements PurchasereturnReq
} }
@Override @Override
@Transactional
public void deletePurchasereturnRequestDetail(Long id) { public void deletePurchasereturnRequestDetail(Long id) {
// 校验存在 // 校验存在
validatePurchasereturnRequestDetailExists(id); validatePurchasereturnRequestDetailExists(id);

3
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@ -110,6 +110,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
private JobsettingService jobsettingService; private JobsettingService jobsettingService;
@Override @Override
@Transactional
public Long createPurchasereturnRequestMain(PurchasereturnRequestMainCreateReqVO createReqVO) { public Long createPurchasereturnRequestMain(PurchasereturnRequestMainCreateReqVO createReqVO) {
PurchasereturnRequestMainDO mainDO = PurchasereturnRequestMainConvert.INSTANCE.convert(createReqVO); PurchasereturnRequestMainDO mainDO = PurchasereturnRequestMainConvert.INSTANCE.convert(createReqVO);
List<PurchasereturnRequestDetailDO> subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); List<PurchasereturnRequestDetailDO> subDOList = PurchasereturnRequestDetailConvert.INSTANCE.convertList03(createReqVO.getSubList());
@ -134,6 +135,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
} }
@Override @Override
@Transactional
public int updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) { public int updatePurchasereturnRequestMain(PurchasereturnRequestMainUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validatePurchasereturnRequestMainExists(updateReqVO.getId()); validatePurchasereturnRequestMainExists(updateReqVO.getId());
@ -169,6 +171,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
} }
@Override @Override
@Transactional
public List<PurchasereturnRequestImportErrorVO> importPurchasereturnRequestList(List<PurchasereturnRequestMainCreateReqVO> datas, Integer mode, boolean updatePart) { public List<PurchasereturnRequestImportErrorVO> importPurchasereturnRequestList(List<PurchasereturnRequestMainCreateReqVO> datas, Integer mode, boolean updatePart) {
if (CollUtil.isEmpty(datas)) { if (CollUtil.isEmpty(datas)) {
throw exception(PURCHASERETURN_REQUEST_IMPORT_LIST_IS_EMPTY); throw exception(PURCHASERETURN_REQUEST_IMPORT_LIST_IS_EMPTY);

4
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestDetailServiceImpl.java

@ -10,6 +10,7 @@ import com.win.module.wms.convert.putawayRequest.PutawayRequestDetailConvert;
import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO; import com.win.module.wms.dal.dataobject.putawayRequest.PutawayRequestDetailDO;
import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper; import com.win.module.wms.dal.mysql.putawayRequest.PutawayRequestDetailMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -31,6 +32,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
private PutawayRequestDetailMapper putawayRequestDetailMapper; private PutawayRequestDetailMapper putawayRequestDetailMapper;
@Override @Override
@Transactional
public Long createPutawayRequestDetail(PutawayRequestDetailCreateReqVO createReqVO) { public Long createPutawayRequestDetail(PutawayRequestDetailCreateReqVO createReqVO) {
// 插入 // 插入
PutawayRequestDetailDO putawayRequestDetail = PutawayRequestDetailConvert.INSTANCE.convert(createReqVO); PutawayRequestDetailDO putawayRequestDetail = PutawayRequestDetailConvert.INSTANCE.convert(createReqVO);
@ -43,6 +45,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
return putawayRequestDetailMapper.selectSenior(conditions); return putawayRequestDetailMapper.selectSenior(conditions);
} }
@Override @Override
@Transactional
public void updatePutawayRequestDetail(PutawayRequestDetailUpdateReqVO updateReqVO) { public void updatePutawayRequestDetail(PutawayRequestDetailUpdateReqVO updateReqVO) {
// 校验存在 // 校验存在
validatePutawayRequestDetailExists(updateReqVO.getId()); validatePutawayRequestDetailExists(updateReqVO.getId());
@ -52,6 +55,7 @@ public class PutawayRequestDetailServiceImpl implements PutawayRequestDetailServ
} }
@Override @Override
@Transactional
public void deletePutawayRequestDetail(Long id) { public void deletePutawayRequestDetail(Long id) {
// 校验存在 // 校验存在
validatePutawayRequestDetailExists(id); validatePutawayRequestDetailExists(id);

Loading…
Cancel
Save