|
|
|
@ -35,6 +35,7 @@ import jnpf.reservoirarea.entity.ReservoirareaEntity;
|
|
|
|
|
import jnpf.reservoirarea.service.ReservoirareaService;
|
|
|
|
|
import jnpf.saleorder.mapper.ReceiptoutsoitemMapper;
|
|
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
|
|
import org.apache.ibatis.annotations.Param;
|
|
|
|
|
import org.bytedeco.opencv.presets.opencv_core;
|
|
|
|
|
import org.springframework.security.core.parameters.P;
|
|
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
@ -151,11 +152,11 @@ public class SaleorderitemController {
|
|
|
|
|
* @param poundlistEntity
|
|
|
|
|
* @return
|
|
|
|
|
*/
|
|
|
|
|
@PutMapping("/updatePrice/{id}")
|
|
|
|
|
public ActionResult updatePrice(@PathVariable("id") String id ,@RequestBody PoundlistEntity poundlistEntity){
|
|
|
|
|
String ids = id;
|
|
|
|
|
PoundlistEntity entity = poundlistEntity;
|
|
|
|
|
return ActionResult.success("1");
|
|
|
|
|
@PostMapping("/updatePrice")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult updatePrice(@RequestBody PoundlistEntity poundlistEntity){
|
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
|
return ActionResult.success("修改单价成功");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
@ -166,7 +167,7 @@ public class SaleorderitemController {
|
|
|
|
|
*/
|
|
|
|
|
@PostMapping("/delivery/{ids}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult delivery(@PathVariable("ids") String ids){
|
|
|
|
|
public ActionResult delivery(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
|
for (String id : idList){
|
|
|
|
@ -195,7 +196,9 @@ public class SaleorderitemController {
|
|
|
|
|
queryWrapper3.lambda().eq(PoundlistEntity::getId,entity.getPoundlistId());
|
|
|
|
|
PoundlistEntity poundlistEntity = poundlistService.getOne(queryWrapper3);
|
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
|
entity.setBatchNo(generaterSwapUtil.getBillNumber("receiptout-num", false));
|
|
|
|
|
}
|
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("chuku", false));
|
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
|
}else{
|
|
|
|
@ -213,7 +216,7 @@ public class SaleorderitemController {
|
|
|
|
|
|
|
|
|
|
@PostMapping("/invoiceentry/{ids}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult invoiceEntry(@PathVariable("ids") String ids){
|
|
|
|
|
public ActionResult invoiceEntry(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
|
for (String id : idList) {
|
|
|
|
|
QueryWrapper<ArinvoicesEntity> queryWrapper2 = new QueryWrapper<>();
|
|
|
|
@ -246,6 +249,7 @@ public class SaleorderitemController {
|
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
|
}
|
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("arinvoices", false));
|
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
|
return ActionResult.success(list);
|
|
|
|
|
} else {
|
|
|
|
@ -310,7 +314,7 @@ public class SaleorderitemController {
|
|
|
|
|
*/
|
|
|
|
|
@PostMapping("/materialback/{ids}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult materialBack(@PathVariable("ids") String ids) {
|
|
|
|
|
public ActionResult materialBack(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
|
for (String id : idList){
|
|
|
|
@ -334,6 +338,7 @@ public class SaleorderitemController {
|
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
|
}
|
|
|
|
|
saleorderitemEntity.setList(dList);
|
|
|
|
|
saleorderitemEntity.setDocumentNo(generaterSwapUtil.getBillNumber("salesBack", false));
|
|
|
|
|
list.add(saleorderitemEntity);
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("未找到该数据");
|
|
|
|
@ -350,7 +355,7 @@ public class SaleorderitemController {
|
|
|
|
|
*/
|
|
|
|
|
@PostMapping("/collection/{ids}")
|
|
|
|
|
@Transactional
|
|
|
|
|
public ActionResult collection(@PathVariable("ids") String ids) {
|
|
|
|
|
public ActionResult collection(@PathVariable("ids") String ids) throws DataException {
|
|
|
|
|
String[] idList = ids.split(",");
|
|
|
|
|
List<SaleorderitemEntity> list = new ArrayList<>();
|
|
|
|
|
for (String id : idList){
|
|
|
|
@ -369,6 +374,7 @@ public class SaleorderitemController {
|
|
|
|
|
entity.setPoundEntity(poundlistEntity);
|
|
|
|
|
}
|
|
|
|
|
sale.setList(dList);
|
|
|
|
|
sale.setDocumentNo(generaterSwapUtil.getBillNumber("collection", false));
|
|
|
|
|
list.add(sale);
|
|
|
|
|
}else{
|
|
|
|
|
return ActionResult.fail("数据状态无法回款");
|
|
|
|
@ -419,7 +425,7 @@ public class SaleorderitemController {
|
|
|
|
|
public ActionResult create(@RequestBody @Valid SaleorderitemCrForm saleorderitemCrForm) throws DataException {
|
|
|
|
|
String mainId =RandomUtil.uuId();
|
|
|
|
|
UserInfo userInfo=userProvider.get();
|
|
|
|
|
saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
|
|
|
|
|
// saleorderitemCrForm.setDocumentNo(generaterSwapUtil.getBillNumber("salesOrder", false));
|
|
|
|
|
saleorderitemCrForm.setCreatorUserName(userInfo.getUserId());
|
|
|
|
|
saleorderitemCrForm.setCreatorTime(DateUtil.getNow());
|
|
|
|
|
SaleorderitemEntity entity = JsonUtil.getJsonToBean(saleorderitemCrForm, SaleorderitemEntity.class);
|
|
|
|
@ -800,6 +806,12 @@ public class SaleorderitemController {
|
|
|
|
|
entitys.setId(RandomUtil.uuId());
|
|
|
|
|
entitys.setSalesOrderId(entity.getId());
|
|
|
|
|
salesorder_item0Service.save(entitys);
|
|
|
|
|
if (entitys.getUnitPrice() != null && entitys.getPoundlistId() !=null) {
|
|
|
|
|
PoundlistEntity poundlistEntity = new PoundlistEntity();
|
|
|
|
|
poundlistEntity.setSalesPrice(entitys.getUnitPrice());
|
|
|
|
|
poundlistEntity.setId(entitys.getPoundlistId());
|
|
|
|
|
poundlistService.updateById(poundlistEntity);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return ActionResult.success("更新成功");
|
|
|
|
|
}else{
|
|
|
|
|