Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/nfykdxnfyy/InventoryDaoImpl.java
===================================================================
diff -u -r30814 -r32678
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/nfykdxnfyy/InventoryDaoImpl.java (.../InventoryDaoImpl.java) (revision 30814)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/dao/nfykdxnfyy/InventoryDaoImpl.java (.../InventoryDaoImpl.java) (revision 32678)
@@ -12,15 +12,27 @@
import net.sf.json.JSONObject;
import net.sf.json.xml.XMLSerializer;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
import com.forgon.disinfectsystem.datasynchronization.dao.nfykdxnfyy.DatasyncConstant;
import com.forgon.disinfectsystem.datasynchronization.dao.nfykdxnfyy.WebServiceClientHelper;
+import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
+import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
import com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao;
import com.forgon.disinfectsystem.inventorymanagement.model.Inventory;
import com.forgon.disinfectsystem.inventorymanagement.model.StorageEntry;
import com.forgon.disinfectsystem.inventorymanagement.model.StorageEntryItem;
+import com.forgon.systemsetting.model.HttpOption;
+import com.forgon.systemsetting.service.HttpOptionManager;
+import com.forgon.tools.GB2Alpha;
+import com.forgon.tools.GB2WB;
import com.forgon.tools.date.DateTools;
+import com.forgon.tools.db.DatabaseUtil;
+import com.forgon.tools.hibernate.ObjectDao;
/**
* 一次性物品接口开发（对接军卫系统）(南方医院)
@@ -31,6 +43,15 @@
public class InventoryDaoImpl implements InventoryDao {
Logger logger = Logger.getLogger(InventoryDaoImpl.class);
+
+ @Autowired
+ private HttpOptionManager httpOptionManager;
+
+ @Autowired
+ private ObjectDao objectDao;
+
+ @Autowired
+ private DiposableGoodsManager diposableGoodsManager;
@Override
public void updateEntryStateAndErrorMessage(String recordState,
@@ -52,9 +73,9 @@
+ ""
+ ""
+ "0"
- + "O9007475一次性使用灭菌橡胶外科手套6.5XXXX75003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001"
- + "O9007475一次性使用灭菌橡胶外科手套7XXXX45003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001"
- + "O9007475一次性使用灭菌橡胶外科手套7.5XXXX90003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001]]>"
+ + "O9007491测试一次性使用灭菌橡胶外科手套09166.5XXXX75003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）20210916001"
+ + "O9007492测试一次性使用灭菌橡胶外科手套09167XXXX45003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）20210916001"
+ + "O9007493测试一次性使用灭菌橡胶外科手套09167.5XXXX90003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074000916]]>"
+ ""
+ "";*/
logger.info("入库单明细接口返回：" + HIPManagerInfoResult);
@@ -133,9 +154,9 @@
+ ""
+ ""
+ "0"
- + "O9007503"
- + "O6039645"
- + "O9007551"
+ + "O9007591"
+ + "O6039692"
+ + "O9007503"
+ "]]>"
+ ""
+ ""
@@ -247,9 +268,9 @@
+ ""
+ ""
+ "0"
- + "O9007475一次性使用灭菌橡胶外科手套6.5XXXX75003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001"
- + "O9007475一次性使用灭菌橡胶外科手套7XXXX45003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001"
- + "O9007475一次性使用灭菌橡胶外科手套7.5XXXX90003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001]]>"
+ + "O9007480测试一次性使用灭菌橡胶外科手套6.5XXXX2028-09-16 00:00:0075003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001"
+ + "O9007480测试一次性使用灭菌橡胶外科手套7XXXX2028-09-16 00:00:0045003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001"
+ + "O9007480测试一次性使用灭菌橡胶外科手套7.5XXXX2028-09-16 00:00:0090003.25马来西亚 Ansell N.P.Sdn.Bhd.（安思尔）01074001]]>"
+ ""
+ "";*/
logger.info("入库单明细接口返回：" + HIPManagerInfoResult);
@@ -376,7 +397,7 @@
/*String HIPManagerInfoResult = ""
+ ""
+ ""
- + "0医用外科口罩挂耳型个.65201073037]]>"
+ + "0医用外科口罩0916挂耳型0916个.652010730370916]]>"
+ ""
+ "";*/
logger.info("物品基础信息接口返回：" + HIPManagerInfoResult);
@@ -408,6 +429,8 @@
JSONObject storageEntryInfo = (JSONObject)inventoryInfoObj;
inventoryInfoArr.add(storageEntryInfo);
}
+ // 获取一次性物品类型
+ List disposableGoodsTypeList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
if(inventoryInfoArr != null && inventoryInfoArr.size() > 0){
List inventoryItemList = new ArrayList();
for (Object object : inventoryInfoArr) {
@@ -425,6 +448,12 @@
inventory.setUnit(unit);
inventory.setCost(cost);
inventory.setSerialNumber(serialNumber);
+ //单上被同步物品的【物品类型】和【类别】信息要设置默认值NFYY-34
+ if(CollectionUtils.isNotEmpty(disposableGoodsTypeList)){
+ inventory.setCategory(disposableGoodsTypeList.get(0));
+ }
+ inventory.setGoodsType(DisposableGoods.TYPE_NAME);
+
inventoryItemList.add(inventory);
}
return inventoryItemList.get(0);
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java
===================================================================
diff -u -r28878 -r32678
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java (.../Inventory.java) (revision 28878)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/Inventory.java (.../Inventory.java) (revision 32678)
@@ -35,6 +35,11 @@
private String typeGoods = DisposableGoods.TYPE_NAME;
/**
+ * 物品类型:一次性物品或材料NFYY-34(单上被同步物品的【物品类型】要设置默认值)
+ */
+ private String goodsType;
+
+ /**
* 针对中大五院的处理,是否一次性.1为是,否则为否
*/
private String one;
@@ -223,6 +228,14 @@
this.typeGoods = typeGoods;
}
+ public String getGoodsType() {
+ return goodsType;
+ }
+
+ public void setGoodsType(String goodsType) {
+ this.goodsType = goodsType;
+ }
+
public Long getSourceIdFromPlatform() {
return sourceIdFromPlatform;
}
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java
===================================================================
diff -u -r30814 -r32678
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java (.../InventoryManagerImpl.java) (revision 30814)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java (.../InventoryManagerImpl.java) (revision 32678)
@@ -539,6 +539,8 @@
type = itemTypeMap.get(inventorySerialNumber).getAsString();
}else if(itemTypeMap.has(displayName)){
type = itemTypeMap.get(displayName).getAsString();
+ }else{
+ type = inventory.getGoodsType();
}
if(StringUtils.isEmpty(type)){
JsonObject needFixItem = convertStorageEntryItemToJsonObject(item);