PDA拣货，物料默认库区，盘点库区调整，整理默认库区，立库转库遗留数据、长宽高调整，sap接口调整
userName
parent
1c34877593
commit
29e8a06be5
|
|
@ -133,7 +133,10 @@ public class Item extends Entity {
|
|||
private boolean beExtend1=false;//扩展1
|
||||
private boolean beExtend2=false;//扩展2
|
||||
private boolean beUnpacking=false;//是否最小包装
|
||||
|
||||
|
||||
private boolean beWholeLine=false;//是否整行发料，不满足整行需要备注。
|
||||
|
||||
|
||||
private Double multipleOrder=0d;//
|
||||
|
||||
private int codePat=0 ;//
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ public class WarehouseArea extends Entity {
|
|||
/**备注*/
|
||||
private String gdm;//固定地标点
|
||||
private Long decLocId;//拣货货架ID
|
||||
/** 是否扫描容器 */
|
||||
/** 是否料号交单 */
|
||||
private boolean beStock;//
|
||||
/** 是否合单 */
|
||||
private boolean beBill;//
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ public class TaskHeBinView extends Entity {
|
|||
|
||||
private double quantity;
|
||||
private int levels=0;//库区是否合单任务
|
||||
/** 是否扫描容器 */
|
||||
/** 是否料号交单 */
|
||||
private boolean beStock;//
|
||||
/** 是否合单 */
|
||||
private boolean beBill;//
|
||||
|
|
|
|||
|
|
@ -1725,6 +1725,7 @@ public class DefaultAgvTaskManager extends DefaultBaseManager implements AgvTask
|
|||
flag = interfaceReqManager.agvASNOutbound("20501", agvTask.getContainerCode(), agvTask.getRobotJobId(), agvTask.getTargetAreaCode());
|
||||
if (flag) {
|
||||
agvTask.setStatus(STATUS.RECEIVED);
|
||||
agvTask.setArrivalTime(new Date());
|
||||
commonDao.store(agvTask);
|
||||
}
|
||||
return flag;
|
||||
|
|
|
|||
|
|
@ -1111,7 +1111,7 @@ public class DefaultImportFileManager extends DefaultBaseManager implements Impo
|
|||
item.setGoodType(bs);
|
||||
*/
|
||||
if(zoneName!=null&&zoneName.length()>0) {
|
||||
List<WarehouseArea> zoneList= commonDao.findByQuery(" from WarehouseArea w where w.name='"+zoneName+"' and w.disabled=false ");
|
||||
List<WarehouseArea> zoneList= commonDao.findByQuery(" from WarehouseArea w where w.name='"+zoneName.trim()+"' and w.disabled=false ");
|
||||
if(zoneList.size()>0) {
|
||||
item.setDefaultWarehouseArea(zoneList.get(0));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,7 +179,7 @@ public interface CountPlanManager extends BaseManager {
|
|||
void AGVworke(Long countPlanId,boolean w1,boolean w2,boolean w3,boolean w4,boolean w5,boolean w6,boolean w7,boolean w8,boolean w9,boolean w10,
|
||||
boolean w11,boolean w12,boolean w13,boolean w14,boolean w15,boolean w16,boolean w17,boolean w18,boolean w19,boolean w20,boolean w21,boolean w22,
|
||||
boolean w601,boolean w602,boolean w603,boolean w604,boolean w605,double w31,double w32,double w33,double w34,double w35,double w36,double w37
|
||||
,double w38,double w39,double w40,double w41);
|
||||
,double w38,double w39,double w40,double w41,double w42,double w43);
|
||||
@Transactional
|
||||
void AGVworke(Long countPlanId,boolean w1,boolean w2,boolean w3,boolean w4,boolean w5,boolean w6,boolean w7,boolean w8,boolean w9,boolean w10,
|
||||
boolean w11,boolean w12,boolean w13,boolean w14,boolean w15,boolean w16,boolean w17,boolean w18,boolean w19,boolean w20,boolean w21,boolean w22);
|
||||
|
|
|
|||
|
|
@ -1597,7 +1597,7 @@ public class DefaultCountPlanManager extends DefaultBaseManager implements
|
|||
boolean w18,boolean w19,boolean w20,boolean w21,boolean w22) {
|
||||
AGVworke( countPlanId, w1, w2, w3, w4, w5, w6, w7, w8, w9, w10,
|
||||
w11, w12, w13, w14, w15, w16, w17,
|
||||
w18, w19, w20, w21,w22,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0);
|
||||
w18, w19, w20, w21,w22,false,false,false,false,false,0,0,0,0,0,0,0,0,0,0,0,0,0);
|
||||
}
|
||||
public List<CountRecord> quserCountPlanTask(long zone_id,long countPlanId) {
|
||||
List<CountRecord> ddq=commonDao.findByQuery(" from CountRecord c where c.location.zone.id="+zone_id
|
||||
|
|
@ -1608,7 +1608,8 @@ public class DefaultCountPlanManager extends DefaultBaseManager implements
|
|||
public void AGVworke(Long countPlanId,boolean w1,boolean w2,boolean w3,boolean w4,boolean w5,boolean w6,boolean w7,boolean w8,boolean w9,boolean w10,
|
||||
boolean w11,boolean w12,boolean w13,boolean w14,boolean w15,boolean w16,boolean w17,
|
||||
boolean w18,boolean w19,boolean w20,boolean w21,boolean w22,boolean w601,boolean w602,boolean w603,boolean w604,boolean w605,
|
||||
double w31,double w32,double w33,double w34,double w35,double w36,double w37,double w38,double w39,double w40,double w41) {
|
||||
double w31,double w32,double w33,double w34,double w35,double w36,double w37,double w38,
|
||||
double w39,double w40,double w41,double w42,double w43) {
|
||||
CountPlan countPlan=commonDao.load(CountPlan.class, countPlanId);
|
||||
if(countPlan!=null) {
|
||||
//料箱区
|
||||
|
|
@ -1816,6 +1817,14 @@ public class DefaultCountPlanManager extends DefaultBaseManager implements
|
|||
if(wwc1.size()>0&&w41==0) {
|
||||
throw new BusinessException("1号万纬外仓有盘点任务，必须勾选");
|
||||
}
|
||||
List<CountRecord> qd3=quserCountPlanTask(1819L, countPlanId);//7#3楼地堆区
|
||||
if(qd3.size()>0&&w42==0) {
|
||||
throw new BusinessException("7#3楼地堆区有盘点任务，必须勾选");
|
||||
}
|
||||
List<CountRecord> qd4=quserCountPlanTask(1822L, countPlanId);//7#4楼地堆区
|
||||
if(qd4.size()>0&&w43==0) {
|
||||
throw new BusinessException("7#4楼地堆区有盘点任务，必须勾选");
|
||||
}
|
||||
int l=0;//料箱区
|
||||
for(Stock stock:sts) {
|
||||
//工作个数
|
||||
|
|
@ -1980,6 +1989,14 @@ public class DefaultCountPlanManager extends DefaultBaseManager implements
|
|||
//1号万纬外仓
|
||||
distributeCountPlan(w41, wwc1);
|
||||
}
|
||||
if(w42>0) {
|
||||
//1号万纬外仓
|
||||
distributeCountPlan(w42, qd3);
|
||||
}
|
||||
if(w43>0) {
|
||||
//1号万纬外仓
|
||||
distributeCountPlan(w43, qd4);
|
||||
}
|
||||
List<CountRecord> countRecords=commonDao.findByQuery(" from CountRecord c where c.countCode is null "
|
||||
+" and c.countPlan.id="+countPlanId+" order by c.location.zone.code,c.location.code");
|
||||
if(countRecords.size()==0) {
|
||||
|
|
@ -1990,7 +2007,7 @@ public class DefaultCountPlanManager extends DefaultBaseManager implements
|
|||
//无指定库区的料号一个任务号
|
||||
String zondName="";//库区
|
||||
String billcode="";//盘点单号
|
||||
for(CountRecord red:hxpq) {
|
||||
for(CountRecord red:countRecords) {
|
||||
Location loc=commonDao.load(Location.class, red.getLocation().getId());
|
||||
WarehouseArea zone=commonDao.load(WarehouseArea.class, loc.getZone().getId());
|
||||
if(zondName.equals("")) {
|
||||
|
|
|
|||
|
|
@ -519,7 +519,11 @@ public class DefaultInterfaceReqManager extends DefaultBaseManager implements In
|
|||
receivedRecord.getReceivedQuantity(), null, srcInv == null ? "" : srcInv.getStatus(),
|
||||
srcInv == null ? 0L : srcInv.getId(), null, asn.getBillType(), userId1, receivedRecord.getBarCode(),
|
||||
null,asn.getSourceType());
|
||||
|
||||
if(item!=null&&receivedRecord.getLocation()!=null) {
|
||||
Location location=commonDao.load(Location.class, receivedRecord.getLocation().getId());
|
||||
item.setWarehouseArea(location.getZone());
|
||||
commonDao.store(item);
|
||||
}
|
||||
inventoryManager.createReceivingInventory( receivedRecord,receivedRecord.getLocation());
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1811,7 +1811,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
|
|||
ASNDetail asnDetail=EntityFactory.getEntity(ASNDetail.class);
|
||||
String adhql=" from ASNDetail ad where ad.lineNo='"+lineNo+"' and ad.asn.id="+asndb.getId();
|
||||
if(strBill2!=null&&!strBill2.equals("")) {
|
||||
adhql+=" and ad.strBill2='"+strBill2+"'";
|
||||
adhql+=" and ad.strBill2='"+strBill2.trim()+"'";
|
||||
}
|
||||
List<ASNDetail> asnDetails = commonDao.findByQuery(adhql);
|
||||
// List<ASNDetail> asnDetails = commonDao.findByQuery(" from ASNDetail ad where ad.lineNo=:lineNo and ad.asn.id=:id",
|
||||
|
|
@ -1989,7 +1989,7 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
|
|||
}
|
||||
asnDetail.setExpectedQuantity(expectedQuantity);
|
||||
asnDetail.setItem(item);
|
||||
asnDetail.setStrBill2(strBill2);
|
||||
asnDetail.setStrBill2(strBill2.trim());
|
||||
asnDetail.setStrBill1(strBill1);
|
||||
asnDetail.setStrBill3(strBill3);
|
||||
asnDetail.setStrBill4(strBill4);
|
||||
|
|
@ -2116,7 +2116,6 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
|
|||
}
|
||||
if(errorcode.equals("200")&&hs.equals("1")) {
|
||||
|
||||
|
||||
for(int j=0;j<jsonArray.size();j++){
|
||||
String billType="QPUTASN";
|
||||
List<BillType> billTypes=commonDao.findByQuery(" from BillType bt where bt.code='"+billType+"'");
|
||||
|
|
@ -2133,21 +2132,21 @@ public class DefaultInterfaceRespManager extends DefaultBaseManager implements I
|
|||
String strBill2=asn.has("SERNR") ? asn.getString("SERNR") : "";//序列号
|
||||
String strBill7=asn.has("RSNUM") ? asn.getString("RSNUM") : "";//预留号
|
||||
String strBill8=asn.has("RSPOS") ? asn.getString("RSPOS") : "";//预留项次号
|
||||
String propC3=asn.has("SBBST") ? asn.getString("SBBST") : "";//特殊标记
|
||||
|
||||
// String propC3=asn.has("SBBST") ? asn.getString("SBBST") : "";//特殊标记
|
||||
String propC3=asn.has("PROPC3") ? asn.getString("PROPC3") : "";//特殊标记入库
|
||||
String strBill3=asn.has("ZXSQ") ? asn.getString("ZXSQ") : "";//是否线上质检
|
||||
String sccj=asn.has("ZXXQ") ? asn.getString("ZXXQ") : "";//是否线下质检
|
||||
String ZGDI=asn.has("ZGDI") ? asn.getString("ZGDI") : "";//是否发货
|
||||
String MEINS=asn.has("MEINS") ? asn.getString("MEINS") : "";//单位
|
||||
String ZOUTWMS=asn.has("ZOUTWMS") ? asn.getString("ZOUTWMS") : "";//是否出WMS仓
|
||||
String strBill4=asn.has("strBill4") ? asn.getString("strBill4") : "";//供应商号
|
||||
String propC5=asn.has("STRBILL4") ? asn.getString("STRBILL4") : "";//供应商号
|
||||
String strBill5=asn.has("strBill5") ? asn.getString("strBill5") : "";//需求人
|
||||
String sourceType=asn.has("BWART") ? asn.getString("BWART") : "";//移动类型
|
||||
String strBill6=asn.has("strBill6") ? asn.getString("strBill6") : "";//删除标记
|
||||
String propC9=asn.has("WERKS") ? asn.getString("WERKS") : "";//接受工厂
|
||||
String propC2=asn.has("ZWERKST") ? asn.getString("ZWERKST") : "";//发出库存地
|
||||
// String propC5=asn.has("ZSONUM") ? asn.getString("ZSONUM") : "";//特殊库存业务编号
|
||||
String propC5=asn.has("LIFNR") ? asn.getString("LIFNR") : "";//特殊库存业务编号
|
||||
String strBill4=asn.has("LIFNR") ? asn.getString("LIFNR") : "";//特殊库存业务编号发货
|
||||
|
||||
String DATUM=asn.has("DATUM") ? asn.getString("DATUM") : "2021-12-31"; //日期 年-月-日
|
||||
String UZEIT=asn.has("UZEIT") ? asn.getString("UZEIT") : "00:00:00"; //时间 时:分:秒
|
||||
|
|
|
|||
|
|
@ -181,11 +181,13 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
+ "item.ISBOM,"
|
||||
+ "(case when item.default_Warehouse_Area_ID is not NULL then item.default_Warehouse_Area_ID ELSE z.id END) as z_id,"
|
||||
+ "item.volume,item.BE_MARK_WEIGHT as beMarkWeight,item.FEE_TYPE,"
|
||||
+ " item.be_Extend1,item.be_Extend2,asn.BILL_TYPE_ID,ad.strBill11,ad.bf_qty ,z.name as z_name "
|
||||
+ " item.be_Extend1,item.be_Extend2,asn.BILL_TYPE_ID,ad.strBill11,ad.bf_qty ,z.name as z_name,"
|
||||
+ "z1.name as z1_name "
|
||||
+ " from ASN_DETAIL ad "
|
||||
+ " left join ASN asn on asn.id=ad.ASN_ID "
|
||||
+ " left join ITEM item on item.id=ad.ITEM_ID "
|
||||
+ " left join zone z on z.id=item.warehouse_Area_ID "
|
||||
+ " left join zone z1 on z1.id=item.default_Warehouse_Area_ID "
|
||||
+ " where 1=1 and ( (ad.strBill=1 or ad.be_quality=0)) ";
|
||||
String jq="";
|
||||
if(itemcode!=null&&!itemcode.equals("")) {
|
||||
|
|
@ -324,7 +326,17 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
return resultJson;
|
||||
}
|
||||
}
|
||||
zoneCode= arrier[23]==null?"":arrier[23].toString();//库区
|
||||
zoneCode= arrier[23]==null?"":arrier[23].toString();//推荐库区
|
||||
String zone1Code= arrier[24]==null?"":arrier[24].toString();//默认库区
|
||||
if(zone1Code!=null&&zone1Code.length()>0) {
|
||||
obj.put("defaultZone", "默认库区"+zone1Code);
|
||||
}else if(zoneCode!=null&&zoneCode.length()>0){
|
||||
obj.put("defaultZone", "推荐库区"+zoneCode);
|
||||
obj.put("z_id", "");
|
||||
}else {
|
||||
obj.put("defaultZone", "推荐库区无");
|
||||
obj.put("z_id", "");
|
||||
}
|
||||
array.add(obj);
|
||||
}
|
||||
data = array.toString();
|
||||
|
|
@ -2022,7 +2034,6 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
int zgz_qty =0;
|
||||
// zgz_qty = selectPickTicketTaskView1(gzzCode,0);//工作站任务数
|
||||
String zgz_sql="select "+
|
||||
// "max(t.id) as id,"+
|
||||
" t.BILLCODE as BILLCODE,"+
|
||||
"COUNT(DISTINCT t.BILLCODE+loc1.code+i.CODE+ik.PROP_C2) as hs,"+
|
||||
"t.END_REGION as targetArea,"+
|
||||
|
|
@ -2056,6 +2067,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
// + " GROUP BY t.BILLCODE ";
|
||||
Query query1 = session.createSQLQuery(zgz_sql.toString());
|
||||
List<Object[]> list1= (List<Object[]>)query1.list();
|
||||
Map<String,String> maplist=new HashMap<String,String>();
|
||||
if(list1.size()>0) {
|
||||
// billCodeqty=list1.size()+"";
|
||||
int bilzte=0;
|
||||
|
|
@ -2067,6 +2079,9 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
if(Integer.parseInt(t_qty)>0) {
|
||||
zgz_qty+=Integer.parseInt(t_qty);
|
||||
}
|
||||
if(!maplist.containsKey(BILLCODE)) {
|
||||
maplist.put(BILLCODE, t_qty);
|
||||
}
|
||||
if(gzz_t==null||gzz_t.equals("")) {
|
||||
bilzte++;
|
||||
}
|
||||
|
|
@ -2116,7 +2131,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
+ " sum(t.PLAN_QUANTITY_MU-t.MOVED_QUANTITY_MU) as quantity,max(ik.PROP_C5) as propC5,"
|
||||
+ " loc.id as locid, loc.code as locCode,ik.PROP_C1 as propC1,ik.PROP_C2 as propC2,ik.PROP_C3 as propC3,"
|
||||
+ " max(ik.PROP_C4) as propC4,MAX(s2.LP) as s_lp ,t.BILLCODE,MAX(CONVERT(varchar(100), "
|
||||
+ " ik.PROP_D2, 23)) as propD2 ,MAX(pt.code) as p_code,MAX(sw.code),MAX(lt.to_Cell_Code) AS to_Cell_Code,MAX(s3.LP) as LP,"
|
||||
+ " ik.PROP_D2, 23)) as propD2 ,MAX(pt.code) as p_code,MAX(sw.code) as sw_code,MAX(lt.to_Cell_Code) AS to_Cell_Code,MAX(s3.LP) as LP,"
|
||||
+ " item.ISBOM as ISBOM,MAX(item.SINGLE_ITEM) as SINGLE_ITEM,item.id as i_id,"
|
||||
+ " MAX(item.STR_EXTEND1) as STR_EXTEND1,MAX(item.unit) as unit,"
|
||||
+ "max(item.be_Extend1) as be_Extend1,max(item.be_Extend2) as be_Extend2, "
|
||||
|
|
@ -2269,13 +2284,21 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
obj.put("z", z);//第几个1
|
||||
obj.put("w", w);//第几个0
|
||||
|
||||
Double invQuantity= (Double) commonDao.findByQuery("select IsNULL(sum(ROUND(inv.quantity,3)),0) from Inventory inv where inv.quantity>0 and inv.location.id="+Long.parseLong(arrier[5].toString())+" and inv.itemKey.item.code='"+arrier[1].toString()+"' ").get(0);
|
||||
Double invQuantity= (Double) commonDao.findByQuery("select IsNULL(sum(ROUND(inv.quantity,3)),0) "
|
||||
+ "from Inventory inv where inv.quantity>0 and inv.location.id="
|
||||
+Long.parseLong(arrier[5].toString())+" and inv.itemKey.item.code='"
|
||||
+arrier[1].toString()+"' ").get(0);
|
||||
obj.put("invQuantity", invQuantity);//库位上库存数量
|
||||
billCode=obj.get("taskCode").toString().trim();//子任务号
|
||||
//子任务剩余任务数
|
||||
String z_hql=" select t.hs from PickTicketTaskView t where 1=1 and t.billcode='"+billCode +"' ";
|
||||
Integer z_qty= Integer.parseInt(commonDao.findByQuery(z_hql).get(0).toString()) ;
|
||||
obj.put("z_qty", z_qty);
|
||||
Integer z_qty=0;
|
||||
// String z_hql=" select t.hs from PickTicketTaskView t where 1=1 and t.billcode='"+billCode +"' ";
|
||||
// z_qty= Integer.parseInt(commonDao.findByQuery(z_hql).get(0).toString()) ;
|
||||
if(maplist.containsKey(billCode)) {
|
||||
obj.put("z_qty", maplist.get(billCode));
|
||||
}else {
|
||||
obj.put("z_qty", z_qty);
|
||||
}
|
||||
|
||||
//图片路径
|
||||
String url="";
|
||||
|
|
@ -3310,7 +3333,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
+ ", max(t.pickTicketDetail.pickTicket.equatedQuantity) as equatedQuantity,"
|
||||
+ " max(t.pickTicketDetail.strBill13) as strBill13 "
|
||||
+ " , max(t.srcLoc.zone.id) as zone_id , t.srcLoc.zone.beBill as beBill,"
|
||||
+ " max(t.srcLoc.zone.levels) as levels2 "
|
||||
+ " max(t.srcLoc.zone.levels) as levels2 ,t.srcLoc.zone.beStock as beStock "
|
||||
+ " from Task t where "
|
||||
+ " t.planQuantityMU>t.movedQuantityMU and t.agvTask.id is null and "
|
||||
+ " t.agvStatus=1 and t.srcLoc.zone.carrierType.id=3 ";
|
||||
|
|
@ -3322,7 +3345,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
}else if(type.equals("1")){
|
||||
sql+=" and t.worker1.id>0 and t.worker1.id="+userId+" ";
|
||||
}
|
||||
sql+=" group by t.billCode ,t.srcLoc.zone.beBill "
|
||||
sql+=" group by t.billCode ,t.srcLoc.zone.beBill,t.srcLoc.zone.beStock "
|
||||
+ " order by max(t.pickTicketDetail.pickTicket.equatedQuantity) desc,max(t.dateBill1),t.billCode ";
|
||||
List<Object[]> objs = commonDao.findByQuery(sql);
|
||||
if (objs .size() > 0) {
|
||||
|
|
@ -3335,6 +3358,8 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
String receiver=object[5]==null?"":object[5].toString();//receiver备注，
|
||||
String zone_id=object[6]==null?"":object[6].toString();//
|
||||
String beBill=object[7]==null?"":object[7].toString();//是否合单
|
||||
String levels2=object[8]==null?"":object[8].toString();//合单标记
|
||||
String beStock=object[9]==null?"":object[9].toString();//是否料号交单
|
||||
String hang=countLing(billCode);
|
||||
obj.put("taskCode", billCode);
|
||||
obj.put("qty", hang);
|
||||
|
|
@ -3348,11 +3373,17 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
urgent="false";
|
||||
}
|
||||
if(beBill!=null&&(beBill.equals("true")||beBill.equals("1"))) {
|
||||
// if(levels2!=null&&!levels2.equals("0")) {
|
||||
obj.put("beBill", "是");
|
||||
}else {
|
||||
obj.put("beBill", "否");
|
||||
}
|
||||
|
||||
if(beStock!=null&&(beStock.equals("true")||beStock.equals("1"))) {
|
||||
// if(levels2!=null&&!levels2.equals("0")) {
|
||||
obj.put("beStock", "是");
|
||||
}else {
|
||||
obj.put("beStock", "否");
|
||||
}
|
||||
obj.put("urgent", urgent);
|
||||
array.add(obj);
|
||||
}
|
||||
|
|
@ -3505,25 +3536,11 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
}else {
|
||||
obj.put("be_Supernova","false");
|
||||
}
|
||||
// if(thb.getLevels()==0) {
|
||||
if(thb.isBeStock()) {
|
||||
obj.put("isScode","true");//库区是否合单任务
|
||||
|
||||
// String shq=" from Task t where t.billCode='"+thb.getBillCode()+"' and t.planQuantityMU>0 "
|
||||
// + " order by t.operateTime desc ";
|
||||
// List<Task> listtask=commonDao.findByQuery(shq);
|
||||
// if(listtask.size()>0) {
|
||||
// Task ta=listtask.get(0);
|
||||
// if(ta.getDstLP()!=null) {
|
||||
// Stock stock=commonDao.load(Stock.class, ta.getDstLP().getId());
|
||||
// obj.put("s_code", stock.getLP());
|
||||
// obj.put("s_id", stock.getId());
|
||||
// }
|
||||
// }
|
||||
}else {
|
||||
obj.put("isScode","false");
|
||||
}
|
||||
|
||||
// if(thb.isBeStock()) {
|
||||
// obj.put("isScode","true");//库区是否合单任务
|
||||
// }else {
|
||||
obj.put("isScode","false");//是否扫描容器吗
|
||||
// }
|
||||
|
||||
Double invQuantity= (Double) commonDao.findByQuery("select IsNULL(sum(ROUND(inv.quantity,3)),0) from Inventory inv "
|
||||
+ "where inv.quantity>0 and inv.location.id="+loc.getId()+" and inv.itemKey.item.code='"+item.getCode()+"' ").get(0);
|
||||
|
|
@ -3586,6 +3603,7 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
ItemKey ik=this.load(ItemKey.class, task.getItemKey().getId());
|
||||
Item item=this.load(Item.class, ik.getItem().getId());
|
||||
Location lc=commonDao.load(Location.class, task.getSrcLoc().getId());
|
||||
WarehouseArea zone=commonDao.load(WarehouseArea.class, lc.getZone().getId());
|
||||
String [] str=null;
|
||||
String ho="";//凭证行号
|
||||
String xlh="";//序列号
|
||||
|
|
@ -3635,6 +3653,20 @@ public class DefaultQueryAppManager extends DefaultBaseManager implements QueryA
|
|||
}else {
|
||||
obj.put("beLOC", "false");
|
||||
}
|
||||
if(zone!=null&&zone.isBeStock()) {
|
||||
String d=pickTicketManager.printLocationCodePick( "", userId, warehouseId);
|
||||
if(d!=null&&d.length()>0) {
|
||||
JSONObject obj2 =JSONObject.fromObject(d);
|
||||
obj.put("s_id", obj2.has("s_id") ? obj2.getString("s_id") : "");
|
||||
obj.put("s_code", obj2.has("s_code") ? obj2.getString("s_code") : "");
|
||||
}else {
|
||||
obj.put("s_id", "");
|
||||
obj.put("s_code", "");
|
||||
}
|
||||
}else {
|
||||
obj.put("s_id", "");
|
||||
obj.put("s_code", "");
|
||||
}
|
||||
|
||||
data=obj.toString();
|
||||
status = "1";
|
||||
|
|
|
|||
|
|
@ -4076,12 +4076,16 @@ public void addASNDetail(Long id,ASNDetail asnDetail) {
|
|||
List<MoveDocDetail> MoveDocDetails=commonDao.findByQuery(" from MoveDocDetail mdd where mdd.receivedRecordId="+r.getId()+" ");
|
||||
if(MoveDocDetails.size()>0){
|
||||
MoveDocDetail mdd=MoveDocDetails.get(0);
|
||||
if(stock!=null) {
|
||||
mdd.setSrcLP(stock);
|
||||
mdd.setSrcLPCode(stock.getLP());
|
||||
if(z.getId()==1766) {
|
||||
commonDao.delete(mdd);
|
||||
}else {
|
||||
if(stock!=null) {
|
||||
mdd.setSrcLP(stock);
|
||||
mdd.setSrcLPCode(stock.getLP());
|
||||
}
|
||||
mdd.setWarehouseArea(z);
|
||||
commonDao.store(mdd);
|
||||
}
|
||||
mdd.setWarehouseArea(z);
|
||||
commonDao.store(mdd);
|
||||
}
|
||||
commonDao.store(r);
|
||||
|
||||
|
|
@ -4091,7 +4095,6 @@ public void addASNDetail(Long id,ASNDetail asnDetail) {
|
|||
+ "receivedrecord where receivedrecord.beMoved=0 and receivedrecord.srcLP.LP='"+r.getSrcLP().getLP()+"' ");//根据这个容器号获取这个容器号的所有数据
|
||||
if(ReceivedRecords.size()>0){
|
||||
for (ReceivedRecord rr : ReceivedRecords) {//循环获取的容器号的所有数据
|
||||
ItemKey itemKey=rr.getItemKey();
|
||||
if(z!=null) {//如果有这个库区
|
||||
if(stock!=null) {
|
||||
rr.setSrcLP(stock);
|
||||
|
|
@ -4102,12 +4105,16 @@ public void addASNDetail(Long id,ASNDetail asnDetail) {
|
|||
List<MoveDocDetail> MoveDocDetails=commonDao.findByQuery(" from MoveDocDetail mdd where mdd.receivedRecordId="+r.getId()+" ");
|
||||
if(MoveDocDetails.size()>0){
|
||||
MoveDocDetail mdd=MoveDocDetails.get(0);
|
||||
if(stock!=null) {
|
||||
mdd.setSrcLP(stock);
|
||||
mdd.setSrcLPCode(stock.getLP());
|
||||
if(z.getId()==1766) {
|
||||
commonDao.delete(mdd);
|
||||
}else {
|
||||
if(stock!=null) {
|
||||
mdd.setSrcLP(stock);
|
||||
mdd.setSrcLPCode(stock.getLP());
|
||||
}
|
||||
mdd.setWarehouseArea(z);
|
||||
commonDao.store(mdd);
|
||||
}
|
||||
mdd.setWarehouseArea(z);
|
||||
commonDao.store(mdd);
|
||||
}
|
||||
}
|
||||
//查询库存
|
||||
|
|
@ -4129,21 +4136,22 @@ public void addASNDetail(Long id,ASNDetail asnDetail) {
|
|||
List<MoveDocDetail> MoveDocDetails=commonDao.findByQuery(" from MoveDocDetail mdd where mdd.receivedRecordId="+r.getId()+" ");
|
||||
if(MoveDocDetails.size()>0){
|
||||
MoveDocDetail mdd=MoveDocDetails.get(0);
|
||||
if(stock!=null) {
|
||||
mdd.setSrcLP(stock);
|
||||
mdd.setSrcLPCode(stock.getLP());
|
||||
if(z.getId()==1766) {
|
||||
commonDao.delete(mdd);
|
||||
}else {
|
||||
if(stock!=null) {
|
||||
mdd.setSrcLP(stock);
|
||||
mdd.setSrcLPCode(stock.getLP());
|
||||
}
|
||||
mdd.setWarehouseArea(z);
|
||||
commonDao.store(mdd);
|
||||
}
|
||||
mdd.setWarehouseArea(z);
|
||||
commonDao.store(mdd);
|
||||
}
|
||||
commonDao.store(r);
|
||||
}else{
|
||||
throw new BusinessException("料箱内由已上架物料，不能转换");
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1069,7 +1069,10 @@ public class DefaultMoveDocManager extends DefaultBaseManager implements MoveDoc
|
|||
||item.getFeeType()==null)) {
|
||||
interfaceReqManager.returnoutReceivedRecord(ids);// 提交SAP
|
||||
}
|
||||
// inventoryManager.createReceivingInventory(r, dstloc);//添加库存记录
|
||||
if(item!=null&&dstloc!=null) {
|
||||
item.setWarehouseArea(dstloc.getZone());
|
||||
commonDao.store(item);
|
||||
}
|
||||
}
|
||||
}
|
||||
// 上架完成清空容器,立库区不清空
|
||||
|
|
|
|||
|
|
@ -148,7 +148,7 @@ public class DefaultNewWaveManager extends DefaultBaseManager implements
|
|||
+ "left join STOCK s1 on s1.id=loc.stock "
|
||||
+ "left join WAVE_DOC wd on wd.id=t.WAVE_DOC_ID "
|
||||
+ "where 1=1 and pt.BILL_TYPE_ID=1094 "
|
||||
+ " and t.agv_status in (0) "
|
||||
+ " and t.agv_status=0 "
|
||||
+ " and wd.code='" + waveDocCode+ "' "
|
||||
+ " and t.WAVE_DOC_ID is not null ";
|
||||
if (zone_id != null) {
|
||||
|
|
|
|||
|
|
@ -9440,7 +9440,6 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
|
|||
WarehouseArea zone=commonDao.load(WarehouseArea.class, sloc.getZone().getId());
|
||||
levels=zone.getLevels();
|
||||
}
|
||||
// tid=t.getId();
|
||||
PickTicketDetail ptd=commonDao.load(PickTicketDetail.class, t.getPickTicketDetail().getId());
|
||||
pt=commonDao.load(PickTicket.class, ptd.getPickTicket().getId());
|
||||
bt=commonDao.load(BillType.class, pt.getBillType().getId());
|
||||
|
|
@ -9537,8 +9536,6 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
|
|||
|
||||
int sunot=0;
|
||||
for(Task t:tasks) {
|
||||
// PickTicketDetail ptd=commonDao.load(PickTicketDetail.class, t.getPickTicketDetail().getId());
|
||||
// PickTicket pt=commonDao.load(PickTicket.class, ptd.getPickTicket().getId());
|
||||
if(t.getSeedWall()!=null&&sunot<1) {
|
||||
SeedWall sw= commonDao.load(SeedWall.class, t.getSeedWall().getId());
|
||||
sw.setStatus(WarehouseAreaStatus.FREE);
|
||||
|
|
@ -9572,7 +9569,7 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
|
|||
lp=s.getLP();
|
||||
}
|
||||
inventoryManager.addInventoryLog(InventoryLogType.PROCESS_UP, 1, t.getBillCode(), mbloc, lp, ik,
|
||||
t.getStorageDate(), pt.getCode(), t.getPlanQuantity(), null, "已出库", t.getId(), "合单",pt.getBillType() ,
|
||||
t.getStorageDate(), pt.getCode(), t.getPlanQuantity(), null, taskStatus, t.getId(), "合单",pt.getBillType() ,
|
||||
userId,t.getBarCode(),srcLoc,pt.getSourceType());
|
||||
|
||||
}
|
||||
|
|
@ -9589,11 +9586,6 @@ public class DefaultPickTicketManager extends DefaultBaseManager implements Pick
|
|||
}
|
||||
}
|
||||
|
||||
//刷新合单状态
|
||||
// String res=whetherOnebill(tid, commonDao,levels);
|
||||
// if(res.equals("合单完成")){
|
||||
// msg+=";"+"可以交单";
|
||||
// }
|
||||
|
||||
return msg;
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import com.dev.energy.server.dao.CommonDao;
|
|||
import com.dev.energy.server.model.EntityFactory;
|
||||
import com.dev.energy.server.web.security.UserHolder;
|
||||
import com.dev.swms.server.model.base.BillType;
|
||||
import com.dev.swms.server.model.base.ContainerType;
|
||||
import com.dev.swms.server.model.base.Equipment;
|
||||
import com.dev.swms.server.model.base.Item;
|
||||
import com.dev.swms.server.model.base.ItemKey;
|
||||
|
|
@ -445,6 +446,7 @@ public class ASNReceiveServlet extends HttpServlet {
|
|||
resultJson=app.saveReDeposit(taskId,deposit,workerId, wId);
|
||||
|
||||
}else if("scanpickItemCode".equals(methodType)){
|
||||
//PDA扫描料号
|
||||
String taskId =json.has("taskId")?json.getString("taskId"):"";
|
||||
String jhItem =json.has("jhItem")?json.getString("jhItem"):"";
|
||||
resultJson=app.scanpickItemCode(taskId,jhItem,workerId, wId);
|
||||
|
|
@ -1442,11 +1444,12 @@ public class ASNReceiveServlet extends HttpServlet {
|
|||
for(String id:result){
|
||||
Stock s=commonDao.load(Stock.class, Long.parseLong(id));
|
||||
LocationStorage l= commonDao.load(LocationStorage.class, l_id);
|
||||
s.setLocationStorage(l);
|
||||
commonDao.store(s);
|
||||
s.setLocationStorage(l);
|
||||
commonDao.store(s);
|
||||
status="1";
|
||||
msg="操作成功!";
|
||||
}
|
||||
status="1";
|
||||
msg="操作成功!";
|
||||
|
||||
} catch (Exception e) {
|
||||
msg=e.getMessage();
|
||||
}
|
||||
|
|
@ -2086,12 +2089,20 @@ public class ASNReceiveServlet extends HttpServlet {
|
|||
List<Task> Tasks= commonDao.findByQuery(" from Task t where t.billCode='"+code+"' ");
|
||||
if(Tasks.size()>0){
|
||||
for(Task t:Tasks){
|
||||
if(t.getWorker1()==null) {
|
||||
t.setWorker1(worker1);
|
||||
t.setDateBill4(new Date());
|
||||
commonDao.store(t);
|
||||
status="1";
|
||||
msg="操作成功!";
|
||||
}else {
|
||||
Worker worker2=commonDao.load(Worker.class, t.getWorker1().getId());
|
||||
status="2";
|
||||
msg="已经被"+worker2.getName()+"领取!";
|
||||
break;
|
||||
}
|
||||
}
|
||||
status="1";
|
||||
msg="操作成功!";
|
||||
|
||||
}else{
|
||||
msg = "找不到相应记录!";
|
||||
}
|
||||
|
|
@ -2523,10 +2534,26 @@ public class ASNReceiveServlet extends HttpServlet {
|
|||
if(invs.size()>0) {
|
||||
msg="该容器有库存不能绑定";
|
||||
}else {
|
||||
s.setStock(s1);
|
||||
commonDao.store(s);
|
||||
status="1";
|
||||
msg="成功！";
|
||||
|
||||
if(s1.getContainerType()!=null) {
|
||||
ContainerType c=commonDao.load(ContainerType.class, s1.getContainerType().getId());
|
||||
if(c.getCode().equals("501")||c.getCode().equals("505")
|
||||
||c.getCode().equals("303")||c.getCode().equals("X1")
|
||||
||c.getCode().equals("X2")||c.getCode().equals("X4")
|
||||
||c.getCode().equals("X8")) {
|
||||
s.setStock(s1);
|
||||
commonDao.store(s);
|
||||
status="1";
|
||||
msg="成功！";
|
||||
}else {
|
||||
msg="该容器不能在工作站使用";
|
||||
}
|
||||
}else {
|
||||
s.setStock(s1);
|
||||
commonDao.store(s);
|
||||
status="1";
|
||||
msg="成功！";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -243,11 +243,19 @@ public class PlanCountServlet extends HttpServlet {
|
|||
List<CountRecord> Tasks= commonDao.findByQuery(" from CountRecord t where t.needCount=0 and t.worker1.id is null and t.countCode='"+code+"' ");
|
||||
if(Tasks.size()>0){
|
||||
for(CountRecord t:Tasks){
|
||||
t.setWorker1(worker1);
|
||||
commonDao.store(t);
|
||||
if(t.getWorker()==null) {
|
||||
t.setWorker1(worker1);
|
||||
commonDao.store(t);
|
||||
status="1";
|
||||
msg="操作成功!";
|
||||
}else {
|
||||
Worker worker2=commonDao.load(Worker.class, t.getWorker1().getId());
|
||||
status="0";
|
||||
msg="已经被"+worker2.getName()+"领取!";
|
||||
break;
|
||||
}
|
||||
}
|
||||
status="1";
|
||||
msg="操作成功!";
|
||||
|
||||
}else{
|
||||
msg = "找不到相应记录!";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
height="400">
|
||||
<inputUIs>
|
||||
<hidden id="btc.id" reserve="false" />
|
||||
|
||||
<list id="btc.plantCode" title="工厂" row="1" col="1" span="1"
|
||||
width="120" readOnly="false" required="false" reserve="false"
|
||||
forceOverride="true">
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
trimSpace="true" isPrecision="true">
|
||||
</text>
|
||||
<booleanList id="warehouseArea.beBill" title="是否合单" defaultValue="false" row="7" col="1" span="1" readOnly="false" required="true" reserve="true" forceOverride="true" inVisible="false"/>
|
||||
<booleanList id="warehouseArea.beStock" title="是否扫描容器" defaultValue="false" row="8" col="2" span="1" readOnly="false" required="true" reserve="true" forceOverride="true" inVisible="false"/>
|
||||
<booleanList id="warehouseArea.beStock" title="是否料号交单" defaultValue="false" row="8" col="2" span="1" readOnly="false" required="true" reserve="true" forceOverride="true" inVisible="false"/>
|
||||
<textArea id="warehouseArea.description" title="描述" row="10"
|
||||
col="1" span="2" readOnly="false" required="false" reserve="false"
|
||||
forceOverride="true" inVisible="false" rows="5" cols="25" />
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ order by wa.name asc,wa.id asc
|
|||
<column id="wa.description" title="描述" visible="true" horizonAlign="center" />
|
||||
<column id="wa.carrierType.type" title="属性" visible="true" horizonAlign="center" />
|
||||
<column id="wa.levels" title="合单标记" visible="true" horizonAlign="center" />
|
||||
<column id="wa.beStock" title="是否扫描容器码"
|
||||
<column id="wa.beStock" title="是否料号交单"
|
||||
visible="true" horizonAlign="center" verticalAlign="middle" format="booleanFormat"
|
||||
formatParam="disabled" />
|
||||
<column id="wa.beBill" title="是否合单"
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<forwards>
|
||||
<forward name="refreshParent" newEnabled="true"
|
||||
editEnabled="true" />
|
||||
<forward name="resetWindow" newEnabled="true" editEnabled="false" />
|
||||
<forward name="resetWindow" newEnabled="true" editEnabled="true" />
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
|
|
|
|||
|
|
@ -118,6 +118,14 @@
|
|||
forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" />
|
||||
<text id="w41" title="1号万纬外仓" defaultValue="0" row="23" span="2" col="1"
|
||||
width="100" readOnly="false" required="false" reserve="false"
|
||||
forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" />
|
||||
<text id="w42" title="7#3楼地堆区" defaultValue="0" row="24" span="1" col="1"
|
||||
width="100" readOnly="false" required="false" reserve="false"
|
||||
forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" />
|
||||
<text id="w43" title="7#4楼地堆区" defaultValue="0" row="24" span="2" col="1"
|
||||
width="100" readOnly="false" required="false" reserve="false"
|
||||
forceOverride="true" inVisible="false" trimSpace="true"
|
||||
isPrecision="true" />
|
||||
|
|
@ -164,12 +172,14 @@
|
|||
<mapping id="w39" className="double" />
|
||||
<mapping id="w40" className="double" />
|
||||
<mapping id="w41" className="double" />
|
||||
<mapping id="w42" className="double" />
|
||||
<mapping id="w43" className="double" />
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="countPlanManager" methodName="AGVworke"
|
||||
parameter="countPlan.id,wid1,wid2,wid3,wid4,wid5,wid6,wid7,wid8,wid9,
|
||||
wid10,wid11,wid12,wid13,wid14,wid15,wid16,wid17,wid18,wid19,wid20,wid21,wid22,
|
||||
w601,w602,w603,w604,w605,w31,w32,w33,w34,w35,w36,w37,w38,w39,w40,w41" />
|
||||
w601,w602,w603,w604,w605,w31,w32,w33,w34,w35,w36,w37,w38,w39,w40,w41,w42,w43" />
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshParent" newEnabled="true" editEnabled="true" />
|
||||
|
|
|
|||
|
|
@ -6,11 +6,6 @@
|
|||
width="300" height="200">
|
||||
<inputUIs>
|
||||
<hidden id="l.id" reserve="false" />
|
||||
|
||||
<!-- <text id="hj" title="工作站" row="1" col="1" readOnly="false" -->
|
||||
<!-- required="false" reserve="false" forceOverride="false" inVisible="false" -->
|
||||
<!-- trimSpace="false" /> -->
|
||||
<!-- trimSpace="false" /> -->
|
||||
<list id="hj" title="工作站" row="1" col="1" width="120px" readOnly="false" required="false" reserve="false" forceOverride="false" enumType="STATUS">
|
||||
<hql><![CDATA[SELECT
|
||||
ls.code,
|
||||
|
|
@ -20,7 +15,7 @@
|
|||
and ls.name in ('602','603','604','605')
|
||||
]]></hql>
|
||||
</list>
|
||||
<!-- <checkbox id="ordersAll" title="是否加急" row="5" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/> -->
|
||||
<checkbox id="ordersAll" title="是否加急" row="5" col="2" defaultValue="false" span="1" readOnly="false" required="false" reserve="false" forceOverride="true" inVisible="false"/>
|
||||
</inputUIs>
|
||||
<buttons>
|
||||
<commit id="1231stockby122231" title="搬运"
|
||||
|
|
|
|||
|
|
@ -51,8 +51,8 @@
|
|||
rd.itemKey.lotInfo.propC2,
|
||||
rd.itemKey.lotInfo.propC3,
|
||||
rd.receivedQuantity,
|
||||
rd.shippedQuantity,
|
||||
rd.receivedQuantity-rd.shippedQuantity,
|
||||
round(rd.shippedQuantity,3),
|
||||
round(rd.receivedQuantity-rd.shippedQuantity,3),
|
||||
rd.itemKey.lotInfo.propC9,
|
||||
rd.barCode,
|
||||
rd.beMoved,
|
||||
|
|
@ -64,8 +64,7 @@
|
|||
left join rd.itemKey
|
||||
left join rd.location loc
|
||||
left join rd.itemKey.item as item
|
||||
|
||||
where 1=1 and ( rd.receivedQuantity>rd.shippedQuantity or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
where 1=1 and ( round(rd.receivedQuantity,3)>round(rd.shippedQuantity,3) or ( /~ordersAll: {ordersAll} = true~/ ))
|
||||
/~loc.code: AND loc.code like {loc.code} ~/
|
||||
/~ad.strBill7: AND (rd.strBill2) like ({ad.strBill7}) ~/
|
||||
/~item.code: AND (item.code) like ({item.code}) ~/
|
||||
|
|
|
|||
|
|
@ -193,19 +193,22 @@
|
|||
containId="true" pageId="modifyTaskSeeViewPage" />
|
||||
<popup id="wmsSapjiaodan1" title="交单完成" enableType="multi" invisible="false" containId="true" pageId="editOutHandOrderPage">
|
||||
</popup>
|
||||
<!-- <commit id="wmsSapjiaodan" title="交单完成" enableType="multi" invisible="false" confirmMessage="确认是否交单完成"> -->
|
||||
<!-- <mappings> -->
|
||||
<!-- <mapping id="ids" className="list" /> -->
|
||||
<!-- </mappings> -->
|
||||
<!-- <actions> -->
|
||||
<!-- <action managerName="pickTicketManager" methodName="wmsjiaodan" -->
|
||||
<!-- parameter="ids" /> -->
|
||||
<!-- </actions> -->
|
||||
<!-- <forwards> -->
|
||||
<!-- <forward name="refreshWindow" newEnabled="true" -->
|
||||
<!-- editEnabled="true" /> -->
|
||||
<!-- </forwards> -->
|
||||
<!-- </commit> -->
|
||||
<commit id="2wmsCloseOrder21" title="关单" enableType="multi" invisible="false" confirmMessage="确认关闭">
|
||||
<enableExpression>
|
||||
<!-- <![CDATA[(${pickTicket.status}=='PICK_ALL' || ${pickTicket.status}=='SHIP_PART' || ${pickTicket.status}=='CLOSE' || ${pickTicket.status}=='HEDAN' || ${pickTicket.status}=='JIAODAN')]]> -->
|
||||
</enableExpression>
|
||||
<mappings>
|
||||
<mapping id="ids" className="list" />
|
||||
</mappings>
|
||||
<actions>
|
||||
<action managerName="pickTicketManager" methodName="wmsPickTicketStatus"
|
||||
parameter="ids" />
|
||||
</actions>
|
||||
<forwards>
|
||||
<forward name="refreshWindow" newEnabled="true"
|
||||
editEnabled="true" />
|
||||
</forwards>
|
||||
</commit>
|
||||
</buttons>
|
||||
</maintainPage>
|
||||
</pages>
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@
|
|||
WHERE 1=1
|
||||
and item.id=(select d.item.id from PickTicketDetail d where d.id={id} )
|
||||
and rd.location.type not in('RECEIVE','SHIP')
|
||||
AND (rd.receivedQuantity-rd.shippedQuantity) > 0
|
||||
AND (round(rd.receivedQuantity,3)-round(rd.shippedQuantity,3)) > 0
|
||||
AND location.warehouse = #{SESSION_WAREHOUSE}
|
||||
/~location.id: AND rd.location.id = {location.id}~/
|
||||
/~itemKeyLot: AND rd.strBill1 LIKE {itemKeyLot}~/
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
order by rd.receiveDate asc,rd.id asc
|
||||
]]></datasource>
|
||||
<columns>
|
||||
<column id="inventory.id" title="ID" visible="false" />
|
||||
<column id="rd.id" title="ID" visible="false" />
|
||||
<column id="inputQuantity" title="inputAllocateQuantity"
|
||||
visible="true" horizonAlign="center" verticalAlign="middle" inputUI="text"
|
||||
inputUIValidator="integerRequired" />
|
||||
|
|
|
|||
Loading…
Reference in New Issue