库存表新增字段以及存值
This commit is contained in:
@@ -251,6 +251,9 @@ public class RkInfo extends BaseEntity
|
|||||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||||
private Date endDate;
|
private Date endDate;
|
||||||
|
/** 场景 */
|
||||||
|
@Excel(name = "场景")
|
||||||
|
private String scene;
|
||||||
public void setId(Long id)
|
public void setId(Long id)
|
||||||
{
|
{
|
||||||
this.id = id;
|
this.id = id;
|
||||||
@@ -796,6 +799,15 @@ public class RkInfo extends BaseEntity
|
|||||||
this.endDate = endDate;
|
this.endDate = endDate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setScene(String scene)
|
||||||
|
{
|
||||||
|
this.scene = scene;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getScene()
|
||||||
|
{
|
||||||
|
return scene;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
@@ -861,6 +873,7 @@ public class RkInfo extends BaseEntity
|
|||||||
.append("startDate", startDate)
|
.append("startDate", startDate)
|
||||||
.append("endDate", endDate)
|
.append("endDate", endDate)
|
||||||
.append("totalAmount", totalAmount)
|
.append("totalAmount", totalAmount)
|
||||||
|
.append("scene", getScene())
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -133,7 +133,7 @@ public class RkBillServiceImpl implements IRkBillService
|
|||||||
for (RkInfo info : rkInfoList) {
|
for (RkInfo info : rkInfoList) {
|
||||||
|
|
||||||
info.setExecStatus(bill.getExecStatus());
|
info.setExecStatus(bill.getExecStatus());
|
||||||
|
String scene = "";
|
||||||
// 库位校验
|
// 库位校验
|
||||||
if (StringUtils.isNotBlank(info.getPcode())) {
|
if (StringUtils.isNotBlank(info.getPcode())) {
|
||||||
PcdeDetail pcde = pcdeDetailMapper.selectByPcodeAndWarehouse(
|
PcdeDetail pcde = pcdeDetailMapper.selectByPcodeAndWarehouse(
|
||||||
@@ -144,6 +144,9 @@ public class RkBillServiceImpl implements IRkBillService
|
|||||||
throw new RuntimeException("库位不存在:" + info.getPcode());
|
throw new RuntimeException("库位不存在:" + info.getPcode());
|
||||||
}
|
}
|
||||||
info.setPcodeId(pcde.getEncodedId());
|
info.setPcodeId(pcde.getEncodedId());
|
||||||
|
if(StringUtils.isNotBlank(pcde.getScene())){
|
||||||
|
scene = pcde.getScene();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// rk_info
|
// rk_info
|
||||||
@@ -159,7 +162,7 @@ public class RkBillServiceImpl implements IRkBillService
|
|||||||
info.setHasMoved("0");
|
info.setHasMoved("0");
|
||||||
info.setIsBorrowed("0");
|
info.setIsBorrowed("0");
|
||||||
info.setIsDelete("0");
|
info.setIsDelete("0");
|
||||||
|
info.setScene(scene);
|
||||||
info.setCreateTime(now);
|
info.setCreateTime(now);
|
||||||
info.setCreateBy(userId);
|
info.setCreateBy(userId);
|
||||||
|
|
||||||
|
|||||||
@@ -66,6 +66,7 @@
|
|||||||
<result property="fycde1" column="fycde_1"/>
|
<result property="fycde1" column="fycde_1"/>
|
||||||
<result property="fycde2" column="fycde_2"/>
|
<result property="fycde2" column="fycde_2"/>
|
||||||
<result property="isUpdate" column="is_update"/>
|
<result property="isUpdate" column="is_update"/>
|
||||||
|
<result property="scene" column="scene"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<!-- ========================= 公共查询 SQL(联表完整版) ========================= -->
|
<!-- ========================= 公共查询 SQL(联表完整版) ========================= -->
|
||||||
@@ -298,7 +299,7 @@
|
|||||||
is_delivery,
|
is_delivery,
|
||||||
fycde_1, fycde_2,
|
fycde_1, fycde_2,
|
||||||
is_update,
|
is_update,
|
||||||
create_by, create_time, is_delete
|
create_by, create_time, is_delete,scene
|
||||||
)
|
)
|
||||||
VALUES (
|
VALUES (
|
||||||
#{operationType}, #{bizType}, #{wlType}, #{cangku}, #{operationTime}, #{operator},
|
#{operationType}, #{bizType}, #{wlType}, #{cangku}, #{operationTime}, #{operator},
|
||||||
@@ -316,7 +317,7 @@
|
|||||||
#{isDelivery},
|
#{isDelivery},
|
||||||
#{fycde1}, #{fycde2},
|
#{fycde1}, #{fycde2},
|
||||||
#{isUpdate},
|
#{isUpdate},
|
||||||
#{createBy}, #{createTime}, #{isDelete}
|
#{createBy}, #{createTime}, #{isDelete},#{scene}
|
||||||
)
|
)
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user