UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

领用相关问题修改

Browse Source
test
anthonywj 1 year ago
parent 450dcbf2a2
commit a038cac875
9 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/glxp/api/controller/inout/11
Unescape Escape View File

@ -1 +0,0 @@
select * from basic_('7328','17117','17119','10053','10053','10052','10052','16844','11500','13649','11499','13749','2393','2677','3247','3247','1979','2379','1981','13201','9195','1984','2395','9028','3548','17129','791','791','1997','2400','3238','840','9615','9615','12476','17136','13978','13980','16729','15846','8919','842','16730','10400','663','663','10401','664','664','16197','17127','17126','15920','17131','16412','17145','2774','7508','652','740','740','17125','17146','10036','9751','15598','17153','2396','16292','7345','17148','4905','8607','742','2381','4510','640','2010','15596','15596','15556','15556','2382','744','11974','14797','11687','15850','2454','7380','15528','15848','5381','7443','8263','15897','12206','12206','747','846','846','847','848','848','848','848','2002','17140','17135','17134','17133','2654','2654','2653','2397','2398','4131','647','10580','4130','833','2563','16696','3354','13180','17086','17080','17081','17077','17147','15381','10037','14043','5448','13179','17143','17151','851','15369','642','642','17124','17139','17138','9741','2009','751','752','15646','857','7371','7371','7378','13588','762','762','8544','1970','14414','4736','4521','14413','14413','4524','2550','2551','684','2339','12474','16220','15633','2003','2008','15603','694','694','10612','14283','4046','15696','793','793','4027','12895','2667','2669','2669','2459','16247','2559','835','17128','17122','17120','17141','17123','15686','655','654','2070','659','10520','15648','809','809','9517','12257','2391','2391','15919','17132','951','1307','15566','15487','15557','947','947','894','894','3609','2908','2469','3188','1778','2913','1779','1779','15761','1804','1803','1803','3094','4264','4265','17171','14944','14944','1667','1667','1805','2935','1806','1672','14359','11147','889','13199','3873','1648','1648','1649','1649','1649','16675','16129','10030','10041','1781','2447','1668','1650','16847','15794','16846','1689','1689','4468','1596','8611','7407','16167','1598','1598','10038','1747','1747','1745','1745','15759','15758','8226','1808','8754','8754','8223','11727','11727','11727','11727','11731','1703','1704','1704','2448','2448','2450','2449','2877','3631','3632','3632','12933','14088','16828','13747','13747','1964','2842','2842','2842','13069','16338','16339','9807','9807','1730','1752','1783','13145','7517','7517','7517','7516','7516','7516','11724','11724','11724','11724','11724','1754','11719','4068','1988','13070','13070','1738','3239','3239','3239','7337','7337','15849','7441','14597','1963','1727','1727','1726','15611','15722','15722','1732','1732','2228','1819','1786','10519','3187','3187','8252','8252','8252','8252','7584','7584','7584','1654','11628','13005','13005','13005','15082','14845','14845','9515','9515','9808','10157','8204','8204','15384','1824','1826','1788','1788','1788','1788','1788','1789','1789','1789','1789','4063','4063','1827','1792','1582','1582','14099','16998','10078','16046','11729','1835','1835','14591','3251','869','1690','1690','1837','14888','14888','1894','8425','8427','10075','10075','15738','15738','16694','15007','3758','3758','1968','17155','2462','2462','1775','1760','1761','10816','1757','1757','1757','3274','3274','3274','3274','15593','15593','15593','15593','17026','17026','17026','17026','17026','17026','13003','17049','13000','13000','13000','14891','14891','8454','15592','15592','7497','9198','9198','10452','10452','4055','4055','4055','2128','16629','16629','16629','14028','16824','14418','2232','13917','2001','14856','1839','10624','15721','16438','1762','1762','8202','8202','1989','1989','15112','15112','16837','16964','16965','2125','2125','2125','1583','1583','1583','1585','1585','1584','1584','2664','2664','14042','14042','14042','7523','13322','1967','3281','3281','3281','2473','2473','9485','14416','14416','16826','16826','13753','13753','13752','14010','14010','7352','13068','13068','15531','15531','11631','2267','2270','2776','2776','3353','3353','3353','2271','10931','10931','10931','10931','10931','2775','2775','2272','2283','2283','2283','2283','3865','12683','12683','2670','2471','1795','1795','1682','2614','2614','14801','16111','4067','7521','1962','10049','10049','1658','1592','1593','1593','1659','10621','10621','10621','10621','10621','10621','10621','10621','15543','15543','15543','11252','14215','14215','14215','14215','14215','13912','13912','13912','14044','14044','14044','15540','15380','15380','15380','13707','13707','10040','14586','14586','4062','8230','1663','1661','1661','1843','1683','1683','15385','15385','15385','14287','1684','1644','14946','14946','14946','14946','15821','14764','14764','9948','3872','3872','3872','1844','1844','1796','11718','13291','13291','13291','13328','13328','13328','12249','12249','15006','15006','15281','1712','1711','1711','1711','1710','13067','13067','4409','15755','1797','1797','1713','2950','2950','1849','1645','1645','14426','1851','3869','3869','3869','14588','7530','7535')

1
src/main/java/com/glxp/api/controller/inout/IoOrderController.java
Unescape Escape View File

@ -167,6 +167,7 @@ public class IoOrderController extends BaseController {
if (ioOrderResponse.getCheckStatus() == null) {
ioOrderResponse.setCheckStatus(0 + "");
}
ioOrderResponse = orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
}
PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);

47
src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java
Unescape Escape View File

@ -70,47 +70,7 @@ public class IoPurChangeService {
//领用单流转
public void purReceiveChange(PurReceiveEntity purReceiveEntity) {
purReceiveEntity = receiveService.selectById(purReceiveEntity.getId());
List<PurReceiveDetailEntity> purReceiveDetailEntityList = receivedetailService.selectByOrderId(purReceiveEntity.getBillNo());
BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_HCLY);
//todo 领用单暂时不支持流转
// PurApplyEntity purApplyEntity = new PurApplyEntity();
// if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetBusAction()) && basicBusTypeChangeEntity.isEnable() == true) {
// purApplyEntity.setBillNo(gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SG_ORDER, "yyyyMMdd")));
// purApplyEntity.setBillDate(purReceiveEntity.getBillDate());
// purApplyEntity.setStatus(basicBusTypeChangeEntity.getBusAuditStatus());
// purApplyEntity.setRemark(purReceiveEntity.getRemark());
// purApplyEntity.setInvCode(purReceiveEntity.getTargetInvCode());
// purApplyEntity.setDeptCode(purReceiveEntity.getTargetDeptCode());
// purApplyEntity.setTargetInvCode(purReceiveEntity.getInvCode());
// purApplyEntity.setTargetDeptCode(purReceiveEntity.getDeptCode());
// purApplyEntity.setCreateUser(purReceiveEntity.getAuditUser());
// purApplyEntity.setCreateTime(DateUtil.timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
// purApplyEntity.setUpdateUser(purReceiveEntity.getAuditUser());
// purApplyEntity.setUpdateTime(DateUtil.timeProcess(purReceiveEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime()));
// if (purApplyEntity.getStatus() == 3) {
// purApplyEntity.setAuditUser("");
// purApplyEntity.setAuditTime(new Date());
// }
// //插入申购主表
// purApplyService.insert(purApplyEntity);
// //用stream流复制list
// List<PurApplyDetailEntity> purApplyDetailEntityList = purReceiveDetailEntityList.stream().map(e -> {
// PurApplyDetailEntity d = new PurApplyDetailEntity();
// d.setOrderIdFk(purApplyEntity.getId() + "");
// d.setProductId(e.getRelIdFk().intValue());
// UdiProductEntity udiProductEntity = udiProductService.findByNameCode(e.getNameCode());
// d.setProductName(udiProductEntity.getCpmctymc());
// d.setCount(e.getCount());
// d.setSupId(e.getSupId());
// d.setZczbhhzbapzbh(udiProductEntity.getZczbhhzbapzbh());
// return d;
// })
// .collect(Collectors.toList());
// purApplyDetailService.insertPurApplyDetailEntity(purApplyDetailEntityList);
//
// }
if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) {
purReceiveGen(purReceiveEntity);
}
@ -337,12 +297,9 @@ public class IoPurChangeService {
ioOrderDetailBizEntity.setCoName(basicProductsEntity.getCpmctymc());
ioOrderDetailBizEntity.setCertCode(basicProductsEntity.getZczbhhzbapzbh());
ioOrderDetailBizEntity.setYlqxzcrbarmc(basicProductsEntity.getYlqxzcrbarmc());
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory());
ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
ioOrderDetailBizEntity.setManufacturer(basicProductsEntity.getManufactory()); ioOrderDetailBizEntity.setMeasname(basicProductsEntity.getMeasname());
ioOrderDetailBizEntity.setSpec(basicProductsEntity.getGgxh());
if (basicProductsEntity.getPrice() != null) {
ioOrderDetailBizEntity.setPrice(BigDecimal.valueOf(basicProductsEntity.getPrice()));
}
ioOrderDetailBizEntity.setPrice(obj.getPrice());
ioOrderDetailBizEntity.setSupId(obj.getSupId());
ioOrderDetailBizService.insert(ioOrderDetailBizEntity);
}

2
src/main/java/com/glxp/api/controller/purchase/PurOrderReceiveController.java
Unescape Escape View File

@ -228,6 +228,7 @@ public class PurOrderReceiveController extends BaseController {
purReceiveDetailEntity.setProductDate(detaiData.getProductDate());
purReceiveDetailEntity.setRelIdFk(detaiData.getRelId());
purReceiveDetailEntity.setBatchNo(detaiData.getBatchNo());
purReceiveDetailEntity.setPrice(detaiData.getPrice());
purReceiveDetailEntity.setSupId(detaiData.getSupId());
receivedetailService.insert(purReceiveDetailEntity);
}
@ -401,7 +402,6 @@ public class PurOrderReceiveController extends BaseController {
if (purReceiveEntity.getStatus() == 3) {
//进行单据流转
purChangeService.purReceiveChange(purReceiveEntity);
// generateDocument(purReceiveEntity);
}
return ResultVOUtils.success("成功");
}

5
src/main/java/com/glxp/api/entity/inout/PurReceiveDetailEntity.java
Unescape Escape View File

@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import java.math.BigDecimal;
/**
* 领用单详情
*/
@ -51,6 +53,9 @@ public class PurReceiveDetailEntity {
@TableField(value = "expireDate")
private String expireDate;
@TableField(value = "price")
private BigDecimal price;
public static final String COL_ID = "id";
public static final String COL_ORDERIDFK = "orderIdFk";

2
src/main/java/com/glxp/api/req/inout/AddReceiveDetailRequest.java
Unescape Escape View File

@ -3,6 +3,7 @@ package com.glxp.api.req.inout;
import com.glxp.api.entity.inout.PurReceiveEntity;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
@ -20,6 +21,7 @@ public class AddReceiveDetailRequest {
private String expireDate;
private String productDate;
private String nameCode;
private BigDecimal price;
}

4
src/main/java/com/glxp/api/res/inout/ReceiveDetailResponse.java
Unescape Escape View File

@ -2,6 +2,8 @@ package com.glxp.api.res.inout;
import lombok.Data;
import java.math.BigDecimal;
@Data
public class ReceiveDetailResponse {
@ -42,7 +44,7 @@ public class ReceiveDetailResponse {
private String ylqxzcrbarmc;
private String manufactory;
private String measname;
private String price;
private BigDecimal price;
private String supName;
}

1
src/main/resources/mybatis/mapper/inv/invProductDao.xml
Unescape Escape View File

@ -426,6 +426,7 @@
auth_dept.name deptName,
auth_warehouse.name invName,
ip.deptCode,
ip.price,
ip.invCode
from inv_product ip
inner join basic_udirel on ip.relIdFk = basic_udirel.id

1
src/main/resources/schemas/schema_v2.3.sql
Unescape Escape View File

@ -1006,3 +1006,4 @@ CALL Pro_Temp_ColumnWork('io_stat_year', 'invCode', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('auth_warehouse', 'lyInvType', 'tinyint', 1);
CALL Pro_Temp_ColumnWork('pur_receive_detail', 'price', 'decimal(10, 2)', 1);

Write Preview
Loading…
Cancel
Save