|
@@ -53,7 +53,7 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
|
|
|
@Transactional(propagation = Propagation.REQUIRES_NEW)
|
|
|
@DS("multi-three")
|
|
|
public Map<String,Integer> callGetUAMaxPK(String StuNo) {
|
|
|
- Map<String,Integer> map = subcontractingOrderMapper.callGetUAMaxPK(StuNo,"103");
|
|
|
+ Map<String,Integer> map = subcontractingOrderMapper.callGetUAMaxPK(StuNo,"103");//账套参数暂时无效,在数据库中已固定账套号
|
|
|
Map<String,Integer> map1 = new HashMap<>();
|
|
|
|
|
|
if(map.get("iFatherId") != null){//主表主键
|
|
@@ -113,6 +113,7 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
|
|
|
map.put("cVenCode",orderInfo.get("cVenCode"));//供货单位 委外订单供应商-根据订单号获取
|
|
|
map.put("cDepCode",orderInfo.get("cDepCode"));//部门-根据订单号获取
|
|
|
map.put("cPersonCode",orderInfo.get("cPersonCode"));//业务员-根据订单号获取
|
|
|
+ map.put("ipurorderid",orderInfo.get("id"));//采购订单主表标识
|
|
|
}
|
|
|
|
|
|
Map<String,String> vendorInfo = subcontractingOrderMapper.selectVendorByCode(orderInfo.get("cVenCode"));
|
|
@@ -133,6 +134,10 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
|
|
|
}else{
|
|
|
throw new RuntimeException("获取入库单号失败");
|
|
|
}
|
|
|
+ StringBuffer sb = new StringBuffer();
|
|
|
+ sb.append("||st01|");
|
|
|
+ sb.append(cCode);
|
|
|
+ map.put("cSysBarCode",sb.toString());
|
|
|
|
|
|
//插入主表
|
|
|
this.baseMapper.saveRdRecord01One(map);
|
|
@@ -184,6 +189,12 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
|
|
|
if(itemMap.get("num") == null){
|
|
|
throw new RuntimeException("num为空");
|
|
|
}
|
|
|
+ StringBuffer sb1 = new StringBuffer();
|
|
|
+ sb1.append("||st01|");
|
|
|
+ sb1.append(cCode);
|
|
|
+ sb1.append("|");
|
|
|
+ sb1.append(rowId);
|
|
|
+ itemMap.put("cbSysBarCode",sb1.toString());
|
|
|
subcontractingOrderMapper.saveRdrecords01One(itemMap);
|
|
|
}
|
|
|
}else{
|
|
@@ -210,14 +221,33 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
|
|
|
return map;
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * pda根据子表二维码获取信息
|
|
|
+ * @param cbSysBarCode
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @DS("multi-three")
|
|
|
+ public Map<String,Object> selectRdAllByBar(String cbSysBarCode) {
|
|
|
+ Map<String,Object> map = subcontractingOrderMapper.selectRdAllByBar(cbSysBarCode);
|
|
|
+
|
|
|
+ return map;
|
|
|
+ }
|
|
|
+
|
|
|
/**
|
|
|
* 审核入库单
|
|
|
- * @param code
|
|
|
+ * @param cbSysBarCode
|
|
|
* @return
|
|
|
*/
|
|
|
- @DS("multi-one")
|
|
|
- public int toExamine(String code,String cHandler){
|
|
|
- return subcontractingOrderMapper.toExamine(code,cHandler);
|
|
|
+ @DS("multi-three")
|
|
|
+ public int toExamine(String id,String cbSysBarCode,String cHandler){
|
|
|
+ subcontractingOrderMapper.updateDef(cbSysBarCode);
|
|
|
+ int num = subcontractingOrderMapper.selectNum(id);
|
|
|
+ if(num == 0){
|
|
|
+ return subcontractingOrderMapper.toExamine(id,cHandler);
|
|
|
+ }else{
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// public Integer getMaxId(String id, String tableName) {
|
|
@@ -230,5 +260,16 @@ public class SubcontractingOrderImpl extends ServiceImpl<SubcontractingOrderMapp
|
|
|
// return maxId;
|
|
|
// }
|
|
|
|
|
|
+ public static void main(String[] args) {
|
|
|
+ String cCode = "00000019";
|
|
|
+ int rowId = 1;
|
|
|
+
|
|
|
+ StringBuffer sb1 = new StringBuffer();
|
|
|
+ sb1.append("||st01|");
|
|
|
+ sb1.append(cCode);
|
|
|
+ sb1.append("|");
|
|
|
+ sb1.append(rowId);
|
|
|
+ System.out.println(sb1.toString());
|
|
|
+ }
|
|
|
|
|
|
}
|