purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品明细接口增加序列号和批号的标识

Browse Source
This commit is contained in:
季圣华
2021-10-10 18:00:42 +08:00
parent c9c0bbc582
commit 1c6640e413
3 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jshERP-boot/src/main/java/com/jsh/erp/controller/DepotItemController.java
View File

@@ -200,6 +200,8 @@ public class DepotItemController {
item.put("batchNumber", diEx.getBatchNumber());
item.put("expirationDate", Tools.parseDateToStr(diEx.getExpirationDate()));
item.put("sku", diEx.getSku());
item.put("enableSerialNumber", diEx.getEnableSerialNumber());
item.put("enableBatchNumber", diEx.getEnableBatchNumber());
item.put("operNumber", diEx.getOperNumber());
item.put("basicNumber", diEx.getBasicNumber());
item.put("preNumber", diEx.getOperNumber()); //原数量

20
jshERP-boot/src/main/java/com/jsh/erp/datasource/entities/DepotItemVo4WithInfoEx.java
View File

@@ -24,6 +24,10 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
private String MOtherField3;
private String enableSerialNumber;
private String enableBatchNumber;
private String DepotName;
private String AnotherDepotName;
@@ -124,6 +128,22 @@ public class DepotItemVo4WithInfoEx extends DepotItem{
this.MOtherField3 = MOtherField3;
}
public String getEnableSerialNumber() {
return enableSerialNumber;
}
public void setEnableSerialNumber(String enableSerialNumber) {
this.enableSerialNumber = enableSerialNumber;
}
public String getEnableBatchNumber() {
return enableBatchNumber;
}
public void setEnableBatchNumber(String enableBatchNumber) {
this.enableBatchNumber = enableBatchNumber;
}
public String getDepotName() {
return DepotName;
}

4
jshERP-boot/src/main/resources/mapper_xml/DepotItemMapperEx.xml
View File

@@ -28,6 +28,8 @@
<result column="MOtherField1" jdbcType="VARCHAR" property="MOtherField1" />
<result column="MOtherField2" jdbcType="VARCHAR" property="MOtherField2" />
<result column="MOtherField3" jdbcType="VARCHAR" property="MOtherField3" />
<result column="enable_serial_number" jdbcType="VARCHAR" property="enableSerialNumber" />
<result column="enable_batch_number" jdbcType="VARCHAR" property="enableBatchNumber" />
<result column="DepotName" jdbcType="VARCHAR" property="DepotName" />
<result column="AnotherDepotName" jdbcType="VARCHAR" property="AnotherDepotName" />
<result column="UnitId" jdbcType="BIGINT" property="UnitId" />
@@ -177,7 +179,7 @@
<select id="getDetailList" parameterType="com.jsh.erp.datasource.entities.DepotItemExample" resultMap="ResultWithInfoExMap">
select di.*,m.name MName,m.model MModel,m.unit MaterialUnit,m.color MColor,m.standard MStandard,m.mfrs MMfrs,
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,
m.other_field1 MOtherField1,m.other_field2 MOtherField2,m.other_field3 MOtherField3,m.enable_serial_number, m.enable_batch_number,
dp1.name DepotName,dp2.name AnotherDepotName, u.id UnitId, u.name unit_name, u.ratio, u.other_unit, me.bar_code barCode
from jsh_depot_item di
left join jsh_material m on di.material_id=m.id and ifnull(m.delete_flag,'0') !='1'