|
@@ -466,7 +466,16 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if (tWarehousebillsitems != null) {
|
|
|
JSONArray warehouseJSON = JSONArray.parseArray(tWarehousebillsitems);
|
|
|
List<TWarehousebillsitems> warehousebillsitemsList = JSONObject.parseArray(warehouseJSON.toJSONString(), TWarehousebillsitems.class);
|
|
|
+ int notInStorage=0;
|
|
|
+ int Stored=0;
|
|
|
for (TWarehousebillsitems wbItem : warehousebillsitemsList) {
|
|
|
+ if(wbItem.getfBillstatus()==null){
|
|
|
+ wbItem.setfBillstatus("1");
|
|
|
+ notInStorage++;
|
|
|
+ }else {
|
|
|
+ wbItem.setfBillstatus("6");
|
|
|
+ Stored++;
|
|
|
+ }
|
|
|
wbItem.setfPid(fPid);
|
|
|
wbItem.setfMarks(warehouseBills.getfMarks());
|
|
|
wbItem.setfMblno(warehouseBills.getfMblno());
|
|
@@ -474,6 +483,17 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
wbItem.setCreateTime(new Date());
|
|
|
tWarehousebillsitemsMapper.insertTWarehousebillsitems(wbItem);
|
|
|
}
|
|
|
+ // 录入库存明细整体状态
|
|
|
+ TWarehouseBills warehouseBill=new TWarehouseBills();
|
|
|
+ warehouseBill.setfId(fPid);
|
|
|
+ if(Stored==0){ // 未入库
|
|
|
+ warehouseBill.setfItemsStatus("1");
|
|
|
+ } else if(notInStorage==0){ // 已入库
|
|
|
+ warehouseBill.setfItemsStatus("6");
|
|
|
+ } else { // 有已入库、有未入库
|
|
|
+ warehouseBill.setfItemsStatus("2");
|
|
|
+ }
|
|
|
+ tWarehouseBillsMapper.updateTWarehousebills(warehouseBill);
|
|
|
}
|
|
|
// 附件添加
|
|
|
if (StringUtils.isNotNull(tWhgenleg)) {
|