zhousq_java
/
sfms_mes3.0
forked from sfms3.0/sfms3.0
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

增加单价和金额。

master
刘忱 2 years ago
parent
b1f4afb3cf
commit
5fd7448fa6
4 changed files with 48 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java
  2. 17
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java
  3. 22
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java
  4. 16
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

13
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/purchase/PurchaseDetailMapper.java
View File

@ -1,17 +1,17 @@
package com.win.module.wms.dal.mysql.purchase;
import java.util.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.mapper.BaseMapperX;
import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
import com.win.framework.mybatis.core.util.QueryWrapperUtils;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* 采购订单子 Mapper
*
@ -88,4 +88,11 @@ public interface PurchaseDetailMapper extends BaseMapperX<PurchaseDetailDO> {
.orderByDesc(PurchaseDetailDO::getId));
}
default PurchaseDetailDO selectPurchaseDetail(String number, String lineNumber, String itemCode) {
return selectOne(new LambdaQueryWrapperX<PurchaseDetailDO>()
.eq(PurchaseDetailDO::getNumber, number)
.eq(PurchaseDetailDO::getLineNumber, lineNumber)
.eq(PurchaseDetailDO::getItemCode, itemCode));
}
}

17
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailService.java
View File

@ -1,15 +1,16 @@
package com.win.module.wms.service.purchase;
import java.util.*;
import javax.validation.*;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailCreateReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailUpdateReqVO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.framework.common.pojo.PageResult;
import javax.validation.Valid;
import java.util.Collection;
import java.util.List;
/**
* 采购订单子 Service 接口
@ -80,4 +81,12 @@ public interface PurchaseDetailService {
*/
List<PurchaseDetailDO> getPurchaseDetailList(PurchaseDetailExportReqVO exportReqVO);
/**
* 获取采购订单详情
* @param number 订单号
* @param lineNumber 订单行号
* @param itemCode 物品编码
* @return
*/
PurchaseDetailDO selectPurchaseDetail(String number, String lineNumber, String itemCode);
}

22
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseDetailServiceImpl.java
View File

@ -1,24 +1,23 @@
package com.win.module.wms.service.purchase;
import com.win.framework.common.pojo.CustomConditions;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailCreateReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailExportReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailPageReqVO;
import com.win.module.wms.controller.purchase.vo.PurchaseDetailUpdateReqVO;
import com.win.module.wms.convert.purchase.PurchaseDetailConvert;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import java.util.*;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.framework.common.pojo.PageResult;
import com.win.module.wms.convert.purchase.PurchaseDetailConvert;
import com.win.module.wms.dal.mysql.purchase.PurchaseDetailMapper;
import javax.annotation.Resource;
import java.util.Collection;
import java.util.List;
import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.win.module.wms.enums.ErrorCodeConstants.*;
import static com.win.module.wms.enums.ErrorCodeConstants.PURCHASE_DETAIL_NOT_EXISTS;
/**
* 采购订单子 Service 实现类
@ -87,4 +86,9 @@ public class PurchaseDetailServiceImpl implements PurchaseDetailService {
return purchaseDetailMapper.selectList(exportReqVO);
}
@Override
public PurchaseDetailDO selectPurchaseDetail(String number, String lineNumber, String itemCode) {
return purchaseDetailMapper.selectPurchaseDetail(number, lineNumber, itemCode);
}
}

16
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java
View File

@ -23,6 +23,7 @@ import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
import com.win.module.wms.dal.dataobject.documentSwitch.SwitchDO;
import com.win.module.wms.dal.dataobject.location.LocationDO;
import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobDetailDO;
import com.win.module.wms.dal.dataobject.purchasereceiptJob.PurchasereceiptJobMainDO;
import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
@ -44,6 +45,7 @@ import com.win.module.wms.service.documentSwitch.SwitchService;
import com.win.module.wms.service.expectin.ExpectinService;
import com.win.module.wms.service.inspectRequest.InspectRequestMainService;
import com.win.module.wms.service.location.LocationService;
import com.win.module.wms.service.purchase.PurchaseDetailService;
import com.win.module.wms.service.purchase.PurchaseMainService;
import com.win.module.wms.service.rule.RuleService;
import com.win.module.wms.service.supplierdeliverRecord.SupplierdeliverRecordMainService;
@ -109,6 +111,8 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
private BusinesstypeService businesstypeService;
@Resource
private LocationService locationService;
@Resource
private PurchaseDetailService purchaseDetailService;
@Override
public PageResult<PurchasereceiptJobMainDO> getPurchasereceiptJobMainSenior(CustomConditions conditions) {
@ -233,7 +237,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
purchasereceiptJobMainDO.setCompleteUserId(String.valueOf(userRespDTO.getId()));
purchasereceiptJobMainDO.setCompleteUserName(userRespDTO.getNickname());
//更新任务表状态
int result = purchasereceiptJobMainMapper.updateById(purchasereceiptJobMainDO);
purchasereceiptJobMainMapper.updateById(purchasereceiptJobMainDO);
//创建采购收货记录主表
PurchasereceiptRecordMainDO purchasereceiptRecordMainDO = new PurchasereceiptRecordMainDO();
BeanUtils.copyProperties(purchasereceiptJobMainDO, purchasereceiptRecordMainDO);
@ -281,8 +285,6 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailUpdateReqVOTemp.getToPackingNumber());
purchasereceiptRecordDetailDO.setQty(purchasereceiptJobDetailUpdateReqVOTemp.getHandleQty());
purchasereceiptRecordDetailDO.setFromPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
purchasereceiptRecordDetailDO.setToPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
purchasereceiptRecordDetailDO.setFromContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
purchasereceiptRecordDetailDO.setToContainerNumber(purchasereceiptJobDetailDO.getContainerNumber());
LocationDO locationDO1 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
@ -291,6 +293,9 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
purchasereceiptRecordDetailDO.setToAreaCode(locationDO2.getAreaCode());
purchasereceiptRecordDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());
purchasereceiptRecordDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice());
purchasereceiptRecordDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchasereceiptRecordDetailDO.getQty()));
purchasereceiptRecordDetailDO.setId(null);
purchasereceiptRecordDetailDO.setCreateTime(null);
purchasereceiptRecordDetailDO.setCreator(null);
@ -308,7 +313,7 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
transactionCreateReqVO.setInventoryAction(transactiontypeDO.getInventoryAction());
transactionCreateReqVO.setTransactionType(transactiontypeDO.getCode());
transactionCreateReqVO.setBusinessType(purchasereceiptRecordMainDO.getBusinessType());
transactionCreateReqVO.setLocationCode(purchasereceiptJobDetailDO.getFromLocationCode());
transactionCreateReqVO.setLocationCode(purchasereceiptJobDetailDO.getToLocationCode());
transactionCreateReqVO.setOwnerCode(purchasereceiptRecordDetailDO.getFromOwnerCode());
transactionCreateReqVO.setPackingNumber(purchasereceiptJobDetailDO.getPackingNumber());
transactionCreateReqVO.setWorker(purchasereceiptJobMainDO.getCompleteUserId());
@ -332,6 +337,9 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
LocationDO locationDO2 = locationService.selectLocation(purchasereceiptJobDetailDO.getFromLocationCode());
purchaseshortageDetailDO.setToAreaCode(locationDO2.getAreaCode());
purchaseshortageDetailDO.setToLocationGroupCode(locationDO2.getLocationGroupCode());
PurchaseDetailDO purchaseDetailDO = purchaseDetailService.selectPurchaseDetail(purchasereceiptJobDetailDO.getPoNumber(), purchasereceiptJobDetailDO.getPoLine(), purchasereceiptJobDetailDO.getItemCode());
purchaseshortageDetailDO.setSinglePrice(purchaseDetailDO.getSinglePrice());
purchaseshortageDetailDO.setAmount(purchaseDetailDO.getSinglePrice().multiply(purchaseshortageDetailDO.getQty()));
purchaseshortageDetailDO.setId(null);
purchaseshortageDetailDO.setCreateTime(null);
purchaseshortageDetailDO.setCreator(null);

Write Preview
Loading…
Cancel
Save